Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
8a7c3d4
ports pools
maxion12345 Jan 17, 2022
cac46cd
adds pool to yogstation
maxion12345 Jan 17, 2022
b5736ac
i webedit in an attempt to appease the linter
maxion12345 Jan 17, 2022
ac07824
Merge branch 'yogstation13:master' into pools
maxion12345 Jan 25, 2022
13695b1
throw works
maxion12345 Jan 25, 2022
2d892f3
Merge branch 'pools' of https://github.com/maxion12345/Yogstation int…
maxion12345 Jan 25, 2022
6857255
throw works
maxion12345 Jan 25, 2022
45f8007
yeah hopefully this works
maxion12345 Jan 29, 2022
e660a3b
fixed
maxion12345 Jan 29, 2022
c0fe6a7
revert yogstation change
maxion12345 Feb 6, 2022
4ebba09
revert revert
maxion12345 Feb 6, 2022
2af370f
i fucking hate yogsbox
maxion12345 Feb 6, 2022
3e661f8
nuclear option
maxion12345 Feb 6, 2022
3ed7dcd
Merge branch 'yogstation13:master' into pools
maxion12345 Feb 6, 2022
d8f7e5a
yogstation is dead. love live yogstation.
maxion12345 Feb 6, 2022
8467964
I DONT FUCKING KNOW
maxion12345 Feb 9, 2022
20e77b3
Merge branch 'pools' of https://github.com/maxion12345/Yogstation int…
maxion12345 Feb 9, 2022
0347323
Revert "I DONT FUCKING KNOW"
maxion12345 Feb 9, 2022
ef1068c
why is this here i cant discard these changes
maxion12345 Feb 9, 2022
385eea5
i really fucking hate this
maxion12345 Feb 9, 2022
778216b
Merge branch 'pools' of https://github.com/maxion12345/Yogstation int…
maxion12345 Feb 9, 2022
f0d0bca
hope this works
maxion12345 Feb 9, 2022
0792a77
Merge branch 'pools' of https://github.com/maxion12345/Yogstation int…
maxion12345 Feb 9, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
725 changes: 302 additions & 423 deletions _maps/map_files/YogsBox/YogsBox.dmm

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion code/__DEFINES/components.dm
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,7 @@
#define COMPONENT_BLOCK_MAGIC 1
#define COMSIG_MOB_HUD_CREATED "mob_hud_created" //from base of mob/create_mob_hud(): ()
#define COMSIG_MOB_ATTACK_HAND "mob_attack_hand" //from base of
#define COMSIG_MOB_ATTACK_HAND_TURF "mob_attack_hand_turf" //from the base of turf/attack_hand
#define COMSIG_MOB_ITEM_ATTACK "mob_item_attack" //from base of /obj/item/attack(): (mob/M, mob/user)
#define COMSIG_MOB_APPLY_DAMAGE "mob_apply_damage" //from base of /mob/living/proc/apply_damage(): (damage, damagetype, def_zone)
#define COMSIG_MOB_ITEM_AFTERATTACK "mob_item_afterattack" //from base of obj/item/afterattack(): (atom/target, mob/user, proximity_flag, click_parameters)
Expand Down Expand Up @@ -240,7 +241,7 @@
#define COMSIG_CARBON_STATUS_STAMCRIT "living_stamcrit" //from base of mob/living/carbon/enter_stamcrit()
#define COMSIG_BODYPART_GAUZED "bodypart_gauzed" // from /obj/item/bodypart/proc/apply_gauze(/obj/item/stack/gauze)
#define COMSIG_BODYPART_GAUZE_DESTROYED "bodypart_degauzed" // from [/obj/item/bodypart/proc/seep_gauze] when it runs out of absorption

#define COMSIG_CARBON_SPECIESCHANGE "mob_carbon_specieschange" //from base of mob/living/carbon/set_species(): (new_race)
// /mob/living/simple_animal/hostile signals
#define COMSIG_HOSTILE_ATTACKINGTARGET "hostile_attackingtarget"
#define COMPONENT_HOSTILE_NO_ATTACK 1
Expand Down
2 changes: 2 additions & 0 deletions code/__DEFINES/movespeed_modification.dm
Original file line number Diff line number Diff line change
Expand Up @@ -72,3 +72,5 @@
#define MOVESPEED_ID_CLOCKCHANT "CLOCKCHANT"

#define MOVESPEED_ID_NECRO_VIRUS_SLOWDOWN "NECRO_VIRUS"

#define MOVESPEED_ID_SWIMMING "SWIMMING_SPEED_MOD"
36 changes: 18 additions & 18 deletions code/_onclick/hud/horror.dm
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
/obj/screen/horror_chemicals
name = "chemicals"
icon_state = "horror_counter"
screen_loc = ui_lingchemdisplay
/datum/hud/chemical_counter
ui_style = 'icons/mob/screen_midnight.dmi'
var/obj/screen/horror_chemicals/chemical_counter
/datum/hud/chemical_counter/New(mob/owner)
. = ..()
chemical_counter = new /obj/screen/horror_chemicals
infodisplay += chemical_counter
/datum/hud/chemical_counter/Destroy()
. = ..()
QDEL_NULL(chemical_counter)
/obj/screen/horror_chemicals
name = "chemicals"
icon_state = "horror_counter"
screen_loc = ui_lingchemdisplay

/datum/hud/chemical_counter
ui_style = 'icons/mob/screen_midnight.dmi'
var/obj/screen/horror_chemicals/chemical_counter

/datum/hud/chemical_counter/New(mob/owner)
. = ..()
chemical_counter = new /obj/screen/horror_chemicals
infodisplay += chemical_counter

/datum/hud/chemical_counter/Destroy()
. = ..()
QDEL_NULL(chemical_counter)

2 changes: 2 additions & 0 deletions code/game/turfs/turf.dm
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,8 @@ GLOBAL_LIST_EMPTY(station_turfs)

/turf/attack_hand(mob/user)
. = ..()
if(SEND_SIGNAL(user, COMSIG_MOB_ATTACK_HAND_TURF, src) & COMPONENT_NO_ATTACK_HAND)
. = TRUE
if(.)
return
user.Move_Pulled(src)
Expand Down
Loading