This commit is contained in:
kevinz000
2020-01-27 22:42:48 -07:00
parent 8c0d8b694c
commit 6eac97524f
3 changed files with 2 additions and 9 deletions
+1 -1
View File
@@ -9,5 +9,5 @@ GLOBAL_LIST_INIT(blacklisted_pool_reagents, list(
/datum/reagent/toxin/plasma, /datum/reagent/oxygen, /datum/reagent/nitrous_oxide, /datum/reagent/nitrogen, //gases
/datum/reagent/fermi, //blanket fermichem ban sorry. this also covers mkultra, genital enlargers, etc etc.
/datum/reagent/drug/aphrodisiac, /datum/reagent/drug/anaphrodisiac, /datum/reagent/drug/aphrodisiacplus, /datum/reagent/drug/anaphrodisiacplus, //literally asking for prefbreaks
/datum/reagent/femcum, /datum/reagent/semen //NO.
/datum/reagent/consumable/femcum, /datum/reagent/consumable/semen //NO.
))
+1 -1
View File
@@ -108,7 +108,7 @@
if(!SEND_SIGNAL(victim, COMSIG_IS_SWIMMING)) //poor guy not swimming time to dunk them!
victim.AddElement(/datum/element/swimming)
controller.mobs_in_pool += victim
if(locate(/obj/structure/pool/ladder) in victim.loc) //safe climbing
if(locate(/obj/structure/pool/ladder) in src) //safe climbing
return
if(iscarbon(AM)) //FUN TIME!
var/mob/living/carbon/H = victim
-7
View File
@@ -31,13 +31,6 @@
desc = "The less-loved portion of the jumping board."
dir = EAST
/obj/structure/pool/Rboard/CheckExit(atom/movable/O as mob|obj, target as turf)
if(istype(O) && O.pass_flags & PASSGLASS)
return TRUE
if(get_dir(O.loc, target) == dir)
return FALSE
return TRUE
/obj/structure/pool/Lboard
name = "JumpBoard"
icon_state = "boardleft"