shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

more work

Browse Source
This commit is contained in:
Metis
2024-09-13 01:50:58 -04:00
parent 8fd779ef02
commit 7b0780804f
320 changed files with 12185 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GainStation13/code/mechanics/fatrousal.dm
+1 -2
View File
@@ -4,7 +4,6 @@
value = 0 //ERP quirk
gain_text = "<span class='notice'>Your body feels like it could grow at any moment.</span>"
lose_text = "<span class='notice'>The feeling of impending growth is gone...</span>"
category = CATEGORY_SEXUAL
mob_trait = TRAIT_FATROUSAL
/datum/quirk/fatrousal/add()
@@ -23,7 +22,7 @@
return C.getArousalLoss()*35
return FALSE
///mob/living/adjustArousalLoss(amount, updating_arousal=1)
///mob/living/adjust_arousal(amount, updating_arousal=1)
// if(HAS_TRAIT(src, TRAIT_FATROUSAL))
// amount = amount * 0.2
// ..()
GainStation13/code/mechanics/helplessness.dm
+3 -3
View File
@@ -5,15 +5,15 @@
return ..()
/datum/species/can_equip(obj/item/I, slot, disable_warning, mob/living/carbon/human/H, bypass_equip_delay_self)
if(HAS_TRAIT(H, TRAIT_NO_BACKPACK) && slot == SLOT_BACK)
if(HAS_TRAIT(H, TRAIT_NO_BACKPACK) && slot ==ITEM_SLOT_BACK)
to_chat(H, "<span class='warning'>You are too fat to wear anything on your back.</span>")
return FALSE
if(!istype(I, /obj/item/clothing/under/color/grey/modular) && HAS_TRAIT(H, TRAIT_NO_JUMPSUIT) && slot == SLOT_W_UNIFORM)
if(!istype(I, /obj/item/clothing/under/color/grey/modular) && HAS_TRAIT(H, TRAIT_NO_JUMPSUIT) && slot ==ITEM_SLOT_W_UNIFORM)
to_chat(H, "<span class='warning'>You are too fat to wear [I].</span>")
return FALSE
if(HAS_TRAIT(H, TRAIT_NO_MISC) && (slot == SLOT_SHOES || slot == SLOT_GLOVES || slot == SLOT_WEAR_SUIT))
if(HAS_TRAIT(H, TRAIT_NO_MISC) && (slot ==ITEM_SLOT_SHOES || slot ==ITEM_SLOT_GLOVES || slot ==ITEM_SLOT_WEAR_SUIT))
to_chat(H, "<span class='warning'>You are too fat to wear [I].</span>")
return FALSE
GainStation13/code/mechanics/infestation.dm
+17 -22
View File
@@ -7,32 +7,32 @@
min_players = 6
/datum/round_event/dessert_infestation
announceWhen = 100
var/static/list/dessert_station_areas_blacklist = typecacheof(/area/space,
announce_when = 100
var/static/list/dessert_station_areas_blacklist = typecacheof(/area/space,
/area/shuttle,
/area/mine,
/area/holodeck,
/area/ruin,
/area/hallway,
/area/hallway/primary,
/area/hallway/secondary,
/area/mine,
/area/holodeck,
/area/ruin,
/area/hallway,
/area/hallway/primary,
/area/hallway/secondary,
/area/hallway/secondary/entry,
/area/engine/supermatter,
/area/engine/atmospherics_engine,
/area/engine/engineering/reactor_core,
/area/engine/engineering/reactor_control,
/area/engine/supermatter,
/area/engine/atmospherics_engine,
/area/engine/engineering/reactor_core,
/area/engine/engineering/reactor_control,
/area/ai_monitored/turret_protected,
/area/layenia/cloudlayer,
/area/asteroid/nearstation,
/area/science/server,
/area/science/explab,
/area/layenia/cloudlayer,
/area/asteroid/nearstation,
/area/science/server,
/area/science/explab,
/area/science/xenobiology,
/area/security/processing)
var/spawncount = 1
fakeable = FALSE
/datum/round_event/dessert_infestation/setup()
announceWhen = rand(announceWhen, announceWhen + 50)
announce_when = rand(announce_when, announce_when + 50)
spawncount = rand(4, 7)
/datum/round_event/dessert_infestation/announce(fake)
@@ -67,11 +67,6 @@
pickedArea = pick_n_take(eligible_areas)
var/list/turf/t = get_area_turfs(pickedArea, SSmapping.station_start)
for(var/turf/thisTurf in t) // now we check if it's a closed turf, cold turf or occupied turf and yeet it
if(isopenturf(thisTurf))
var/turf/open/tempGet = thisTurf
if(tempGet.air.temperature <= T0C)
t -= thisTurf
continue
if(isclosedturf(thisTurf))
t -= thisTurf
else
GainStation13/code/mechanics/metal_cruncher.dm
-1
View File
@@ -4,7 +4,6 @@
value = 0 //ERP quirk
gain_text = "<span class='notice'>You feel like you could eat steel.</span>"
lose_text = "<span class='notice'>Your teeth hurt too much...</span>"
category = CATEGORY_FOOD
mob_trait = TRAIT_METAL_CRUNCHER
/obj/item/stack
GainStation13/code/mechanics/water_sponge.dm
+3 -4
View File
@@ -4,7 +4,6 @@
value = 0 //ERP quirk
gain_text = "<span class='notice'>You feel absorbant.</span>"
lose_text = "<span class='notice'>You don't feel absorbant anymore.</span>"
category = CATEGORY_FOOD
mob_trait = TRAIT_WATER_SPONGE
/datum/reagent/water/on_mob_add(mob/living/L, amount)
@@ -28,7 +27,7 @@
M.reagents.add_reagent(/datum/reagent/water, reac_volume/2)
if(method == VAPOR)
M.reagents.add_reagent(/datum/reagent/water, reac_volume/3)
/datum/reagent/water/proc/fat_hide(mob/living/carbon/user)
return volume * 3.5
@@ -67,7 +66,7 @@
add_fingerprint(usr)
attached = target
START_PROCESSING(SSobj, src)
/obj/structure/sink/process()
if(!(get_dist(src, attached) <= 1 && isturf(attached.loc)))
to_chat(attached, "<span class='userdanger'>[attached] is ripped from the sink!</span>") // GS13
@@ -78,7 +77,7 @@
attached.reagents.add_reagent(/datum/reagent/water, 5)
else
return PROCESS_KILL
/obj/structure/sink/attack_hand(mob/living/user)
if(attached)
visible_message("[attached] is detached from [src]")
GainStation13/code/mechanics/web_weaving.dm
+7 -8
View File
@@ -4,7 +4,6 @@
value = 0 //ERP quirk
gain_text = "<span class='notice'>You find yourself able to weave webs.</span>"
lose_text = "<span class='notice'>You are no longer able to weave webs.</span>"
category = CATEGORY_SEXUAL
mob_trait = TRAIT_WEB_WEAVER
///What action is linked with this quirk?
var/datum/action/innate/wrap_target/linked_action1
@@ -20,7 +19,7 @@
linked_action1.Remove(quirk_holder)
linked_action2.Remove(quirk_holder)
return ..()
/datum/action/innate/wrap_target
name = "wrap"
desc = "encases a humanoid in a web cocoon."
@@ -32,14 +31,14 @@
var/mob/living/carbon/user = owner
if(!user || !ishuman(user))
return FALSE
var/mob/living/carbon/human/target = user.pulling
if(!target || !ishuman(target) || user.grab_state < GRAB_AGGRESSIVE) //Add a check for a bondage pref whenever that gets added in.
to_chat(user, "<span class='warning'>You need to aggressively grab a humanoid to use this.</span>")
return FALSE
if(target.wear_suit)
var/obj/item/clothing/suit = target.wear_suit
var/obj/item/clothing/suit = target.wear_suit
if(istype(suit, /obj/item/clothing/suit/straight_jacket/web))
user.visible_message("<span class='warning'>[user] begins to fully encase [target] in a cocoon!</span>", "<span class='warning'>You begin to fully encase [target] in a cocoon.</span>")
if(!do_after_mob(user, target, 30 SECONDS))
@@ -58,7 +57,7 @@
new_matrix.Translate(0,16 * (cocoon_size-1))
spawned_cocoon.transform = new_matrix
return TRUE
return TRUE
user.visible_message("<span class='warning'>[user] attempts to remove [target]'s [target.wear_suit]!</span>", "<span class='warning'>You attempt to remove [target]'s [target.wear_suit].</span>")
if(!do_after_mob(user, target, 10 SECONDS) || !target.dropItemToGround(suit))
@@ -69,7 +68,7 @@
return FALSE
user.visible_message("<span class='warning'>[user] attempts to wrap [target] inside of [wrapping]!</span>", "<span class='warning'>You attempt to wrap [target] inside of [wrapping].</span>")
if(!do_after_mob(user, target, 20 SECONDS) || !target.equip_to_slot_if_possible(wrapping, SLOT_WEAR_SUIT, TRUE, TRUE))
if(!do_after_mob(user, target, 20 SECONDS) || !target.equip_to_slot_if_possible(wrapping,ITEM_SLOT_WEAR_SUIT, TRUE, TRUE))
user.visible_message("<span class='warning'>[user] fails to wrap [target] inside of [wrapping]!</span>", "<span class='warning'>You fail to wrap [target] inside of [wrapping].</span>")
return FALSE
@@ -86,10 +85,10 @@
breakouttime = 600 //1 minute is reasonable.
equip_delay_other = 0
equip_delay_self = 0
mutantrace_variation = NO_MUTANTRACE_VARIATION
mutantrace_variation = NONE
/obj/item/clothing/suit/straight_jacket/web/equipped(mob/user, slot)
. = ..()
. = ..()
if((user.get_item_by_slot(SLOT_WEAR_SUIT)) != src && !QDELETED(src))
qdel(src)