mirror of
https://github.com/KabKebab/GS13.git
synced 2026-07-10 15:36:56 +01:00
small tweaks
- removed lewd hyper trait objectives - added knockdown airlock stun (back)
This commit is contained in:
@@ -19,6 +19,7 @@
|
||||
to_chat(L, "<span class='danger'>As you attempt to pass through \the [src], your ample curves get wedged in the narrow opening. You find yourself stuck in the [src] frame, struggling to free yourself from the tight squeeze.</span>")
|
||||
sleep(100)
|
||||
L.doorstuck = 0
|
||||
L.Knockdown(1)
|
||||
return ..()
|
||||
|
||||
else if(L.fatness > 3000)
|
||||
@@ -28,6 +29,7 @@
|
||||
to_chat(L, "<span class='danger'>As you attempt to pass through \the [src], your ample curves get wedged in the narrow opening. You find yourself stuck in the [src] frame, struggling to free yourself from the tight squeeze.</span>")
|
||||
sleep(55)
|
||||
L.doorstuck = 0
|
||||
L.Knockdown(1)
|
||||
return ..()
|
||||
if(rand(1, 5) == 5)
|
||||
to_chat(L, "<span class='danger'>With great effort, you manage to squeeze your massive form through \the [src]. It's a tight fit, but you successfully navigate the narrow opening, barely avoiding getting stuck.</span>")
|
||||
|
||||
@@ -205,34 +205,36 @@ GLOBAL_LIST_INIT(hyper_special_roles, list(
|
||||
|
||||
|
||||
|
||||
/datum/objective/noncon/find_target()
|
||||
//..()
|
||||
//to_chat(world, "<span class='boldannounce'>TEST: noncon/find_target() called</span>")
|
||||
var/list/datum/mind/targets = list()
|
||||
var/list/datum/mind/owners = get_owners()
|
||||
for(var/datum/mind/candidate in SSticker.minds)
|
||||
if (!(candidate in owners) && ishuman(candidate.current) && (candidate.current.client))
|
||||
if(candidate.current.client?.prefs?.noncon == 1)
|
||||
targets += candidate
|
||||
if(targets.len > 0)
|
||||
target = pick(targets)
|
||||
else
|
||||
target = null
|
||||
update_explanation_text()
|
||||
return target
|
||||
//GS13 - this shit's just fucking weird lol, gtfo
|
||||
|
||||
// /datum/objective/noncon/find_target()
|
||||
// //..()
|
||||
// //to_chat(world, "<span class='boldannounce'>TEST: noncon/find_target() called</span>")
|
||||
// var/list/datum/mind/targets = list()
|
||||
// var/list/datum/mind/owners = get_owners()
|
||||
// for(var/datum/mind/candidate in SSticker.minds)
|
||||
// if (!(candidate in owners) && ishuman(candidate.current) && (candidate.current.client))
|
||||
// if(candidate.current.client?.prefs?.noncon == 1)
|
||||
// targets += candidate
|
||||
// if(targets.len > 0)
|
||||
// target = pick(targets)
|
||||
// else
|
||||
// target = null
|
||||
// update_explanation_text()
|
||||
// return target
|
||||
|
||||
|
||||
/datum/objective/noncon/check_completion()
|
||||
if(!target)
|
||||
return TRUE
|
||||
else
|
||||
return target.sexed
|
||||
// /datum/objective/noncon/check_completion()
|
||||
// if(!target)
|
||||
// return TRUE
|
||||
// else
|
||||
// return target.sexed
|
||||
|
||||
/datum/objective/noncon/update_explanation_text()
|
||||
if(target)
|
||||
explanation_text = "Locate [target.name], and sate your lust."
|
||||
else
|
||||
explanation_text = "Free Lewd Objective"
|
||||
// /datum/objective/noncon/update_explanation_text()
|
||||
// if(target)
|
||||
// explanation_text = "Locate [target.name], and sate your lust."
|
||||
// else
|
||||
// explanation_text = "Free Lewd Objective"
|
||||
|
||||
/datum/antagonist/traitor/lewd/roundend_report()
|
||||
var/list/result = list()
|
||||
|
||||
@@ -182,7 +182,7 @@ datum/gear/lyricalpawsring
|
||||
name = "GATO Badge - Correspondent"
|
||||
category = SLOT_IN_BACKPACK
|
||||
path = /obj/item/clothing/accessory/medal/gato_badge/middleman
|
||||
ckeywhitelist = list("johnjimjim", "sonoida", "yeeny")
|
||||
ckeywhitelist = list("johnjimjim", "sonoida", "yeeny", "notnumber")
|
||||
/datum/gear/halsey_overcoat
|
||||
name = "Halsey's Commander Overcoat"
|
||||
category = SLOT_IN_BACKPACK
|
||||
|
||||
Reference in New Issue
Block a user