Label GS13 changes

Since commit 5084020 on Jan 30, 2023
This commit is contained in:
psq95
2023-08-29 21:05:42 +01:00
parent 8e09f3b9ca
commit cb43bf0dfc
77 changed files with 253 additions and 247 deletions
@@ -11,7 +11,7 @@
desc = "It's watching you suspiciously."
/obj/structure/closet/crate/necropolis/tendril/PopulateContents()
var/loot = rand(1,34)
var/loot = rand(1,33)
switch(loot)
if(1)
new /obj/item/shared_storage/red(src)
@@ -65,7 +65,7 @@
new /obj/item/circuitboard/machine/plantgenes/vault
if(23)
new /obj/item/grenade/clusterbuster/soap(src)
new /obj/item/grenade/chem_grenade/glitter/pink(src)
new /obj/item/grenade/chem_grenade/glitter/pink(src) // GS13
new /obj/item/grenade/chem_grenade/glitter/blue(src)
if(24)
new /obj/item/reagent_containers/food/drinks/bottle/holywater/hell(src)
@@ -79,8 +79,9 @@
new /obj/item/bedsheet/cult(src)
if(28)
new /obj/item/clothing/neck/necklace/memento_mori(src)
// GS13
if(29)
new /obj/item/book/granter/spell/fattening(src) //GS13 STUFF
new /obj/item/book/granter/spell/fattening(src)
new /obj/item/grenade/chem_grenade/lipoifier_weak(src)
if(30)
new /obj/item/book/granter/spell/fattening/transfer(src)
@@ -91,8 +92,6 @@
new /obj/item/gun/energy/fatoray/cannon(src)
if(33)
new /obj/item/gun/magic/wand/food(src)
// if(29)
// new /obj/item/clothing/gloves/gauntlets(src)
//KA modkit design discs
/obj/item/disk/design_disk/modkit_disc
@@ -190,6 +189,7 @@
to_chat(itemUser, failText)
return
if(do_after(itemUser, 30, target = itemUser))
// GS13: "sentient creatures"
itemUser.say("I will remember that I remain a member of society, with special obligations to all my fellow sentient creatures, those sound of mind and body as well as the infirm.", forced = "hippocratic oath")
else
to_chat(itemUser, failText)
+4 -7
View File
@@ -7,9 +7,7 @@
layer = WALL_OBJ_LAYER
var/list/hit_sounds = list('sound/weapons/genhit1.ogg', 'sound/weapons/genhit2.ogg', 'sound/weapons/genhit3.ogg',\
'sound/weapons/punch1.ogg', 'sound/weapons/punch2.ogg', 'sound/weapons/punch3.ogg', 'sound/weapons/punch4.ogg')
//GS13 EDIT
///How much fatness is lost when punching?
var/loss_per_punch = 2.5
var/loss_per_punch = 2.5 // GS13
/obj/structure/punching_bag/attack_hand(mob/user as mob)
. = ..()
@@ -22,7 +20,7 @@
SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT, "exercise", /datum/mood_event/exercise)
L.apply_status_effect(STATUS_EFFECT_EXERCISED)
//GS13 EDIT
//GS13
var/mob/living/carbon/puncher = user
if(puncher)
puncher.adjust_fatness(-loss_per_punch, FATTENING_TYPE_WEIGHT_LOSS)
@@ -33,8 +31,7 @@
density = TRUE
anchored = TRUE
var/icon_state_inuse
//GS13 EDIT
///How much fatness is lost when using the machine?
//GS13
var/loss_per_use = 30
/obj/structure/weightmachine/proc/AnimateMachine(mob/living/user)
@@ -66,7 +63,7 @@
to_chat(user, finishmessage)
user.apply_status_effect(STATUS_EFFECT_EXERCISED)
//GS13 Edit
//GS13
var/mob/living/carbon/lifter = user
if(lifter)
lifter.adjust_fatness(-loss_per_use, FATTENING_TYPE_WEIGHT_LOSS)