mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-13 03:33:21 +00:00
[MIRROR] Lose some weight, fatty (#9900)
Co-authored-by: SatinIsle <98125273+SatinIsle@users.noreply.github.com> Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
committed by
GitHub
parent
1adbd99f4a
commit
d462b7f748
@@ -3,7 +3,7 @@
|
|||||||
desc = "It's a burial receptacle for the dearly departed."
|
desc = "It's a burial receptacle for the dearly departed."
|
||||||
icon = 'icons/obj/closets/coffin.dmi'
|
icon = 'icons/obj/closets/coffin.dmi'
|
||||||
|
|
||||||
icon_state = "closed"
|
icon_state = "closed_unlocked"
|
||||||
seal_tool = /obj/item/tool/screwdriver
|
seal_tool = /obj/item/tool/screwdriver
|
||||||
breakout_sound = 'sound/weapons/tablehit1.ogg'
|
breakout_sound = 'sound/weapons/tablehit1.ogg'
|
||||||
closet_appearance = null // Special icon for us
|
closet_appearance = null // Special icon for us
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
icon = 'icons/obj/stationobjs.dmi'
|
icon = 'icons/obj/stationobjs.dmi'
|
||||||
anchored = TRUE
|
anchored = TRUE
|
||||||
var/being_used = 0
|
var/being_used = 0
|
||||||
|
var/weightloss_power = 1
|
||||||
|
|
||||||
/obj/structure/fitness/punchingbag
|
/obj/structure/fitness/punchingbag
|
||||||
name = "punching bag"
|
name = "punching bag"
|
||||||
@@ -25,7 +26,7 @@
|
|||||||
playsound(src, 'sound/effects/woodhit.ogg', 25, 1, -1)
|
playsound(src, 'sound/effects/woodhit.ogg', 25, 1, -1)
|
||||||
user.do_attack_animation(src)
|
user.do_attack_animation(src)
|
||||||
user.adjust_nutrition(-10) //CHOMPEdit Set nutrition drain to be the same as in fitness_machines_vr.dm
|
user.adjust_nutrition(-10) //CHOMPEdit Set nutrition drain to be the same as in fitness_machines_vr.dm
|
||||||
user.weight -= 0.1 * (0.01 * user.weight_loss) // CHOMPAdd Add weight loss to old fitness equipment
|
user.weight -= 0.25 * weightloss_power * (0.01 * user.weight_loss)
|
||||||
to_chat(user, span_warning("You [pick(hit_message)] \the [src]."))
|
to_chat(user, span_warning("You [pick(hit_message)] \the [src]."))
|
||||||
|
|
||||||
/obj/structure/fitness/weightlifter
|
/obj/structure/fitness/weightlifter
|
||||||
@@ -65,7 +66,8 @@
|
|||||||
if(do_after(user, 30 + (weight * 10))) //CHOMPEdit Set timer to be similar to the machines in fitness_machines_vr.dm
|
if(do_after(user, 30 + (weight * 10))) //CHOMPEdit Set timer to be similar to the machines in fitness_machines_vr.dm
|
||||||
playsound(src, 'sound/effects/weightdrop.ogg', 25, 1)
|
playsound(src, 'sound/effects/weightdrop.ogg', 25, 1)
|
||||||
user.adjust_nutrition(weight * -10)
|
user.adjust_nutrition(weight * -10)
|
||||||
user.weight -= 0.1 * weight * (0.01 * user.weight_loss) // CHOMPAdd Add weight loss to old fitness equipment
|
var/weightloss_enhanced = weightloss_power * (weight * 0.5)
|
||||||
|
user.weight -= 0.25 * weightloss_enhanced * (0.01 * user.weight_loss)
|
||||||
to_chat(user, span_notice("You lift the weights [qualifiers[weight]]."))
|
to_chat(user, span_notice("You lift the weights [qualifiers[weight]]."))
|
||||||
being_used = 0
|
being_used = 0
|
||||||
else
|
else
|
||||||
|
|||||||
@@ -549,7 +549,7 @@
|
|||||||
if(O.possessed_voice && O.possessed_voice.len)
|
if(O.possessed_voice && O.possessed_voice.len)
|
||||||
for(var/mob/living/voice/V in O.possessed_voice)
|
for(var/mob/living/voice/V in O.possessed_voice)
|
||||||
D.inhabit_item(V, null, V.tf_mob_holder)
|
D.inhabit_item(V, null, V.tf_mob_holder)
|
||||||
V.Destroy()
|
qdel(V)
|
||||||
O.possessed_voice = list()
|
O.possessed_voice = list()
|
||||||
//CHOMPAdd End
|
//CHOMPAdd End
|
||||||
return TRUE
|
return TRUE
|
||||||
@@ -558,7 +558,7 @@
|
|||||||
if(O.possessed_voice && O.possessed_voice.len)
|
if(O.possessed_voice && O.possessed_voice.len)
|
||||||
for(var/mob/living/voice/V in O.possessed_voice)
|
for(var/mob/living/voice/V in O.possessed_voice)
|
||||||
D.inhabit_item(V, null, V.tf_mob_holder)
|
D.inhabit_item(V, null, V.tf_mob_holder)
|
||||||
V.Destroy()
|
qdel(V)
|
||||||
O.possessed_voice = list()
|
O.possessed_voice = list()
|
||||||
//CHOMPAdd End
|
//CHOMPAdd End
|
||||||
return TRUE
|
return TRUE
|
||||||
|
|||||||
@@ -21,7 +21,7 @@
|
|||||||
else //If they have enough nutrition and body weight, they can exercise.
|
else //If they have enough nutrition and body weight, they can exercise.
|
||||||
user.setClickCooldown(cooldown)
|
user.setClickCooldown(cooldown)
|
||||||
user.adjust_nutrition(-10 * weightloss_power)
|
user.adjust_nutrition(-10 * weightloss_power)
|
||||||
user.weight -= 0.1 * weightloss_power * (0.01 * user.weight_loss) //CHOMPEdit Making weight loss mechanically more accessible
|
user.weight -= 0.25 * weightloss_power * (0.01 * user.weight_loss)
|
||||||
flick("[icon_state]2", src)
|
flick("[icon_state]2", src)
|
||||||
var/message = pick(messages)
|
var/message = pick(messages)
|
||||||
to_chat(user, span_notice("[message]."))
|
to_chat(user, span_notice("[message]."))
|
||||||
|
|||||||
Binary file not shown.
|
Before Width: | Height: | Size: 898 B After Width: | Height: | Size: 907 B |
@@ -74,7 +74,7 @@
|
|||||||
return TRUE
|
return TRUE
|
||||||
|
|
||||||
// welp, clean up.
|
// welp, clean up.
|
||||||
neworgan.Destroy()
|
qdel(neworgan)
|
||||||
return FALSE
|
return FALSE
|
||||||
|
|
||||||
|
|
||||||
@@ -344,7 +344,7 @@
|
|||||||
if(!turf_clear(T))
|
if(!turf_clear(T))
|
||||||
T = get_turf(src)
|
T = get_turf(src)
|
||||||
new /obj/effect/decal/cleanable/confetti(T)
|
new /obj/effect/decal/cleanable/confetti(T)
|
||||||
Destroy()
|
qdel(src)
|
||||||
|
|
||||||
|
|
||||||
// Teleports you randomly, until it gets you killed
|
// Teleports you randomly, until it gets you killed
|
||||||
@@ -515,7 +515,7 @@
|
|||||||
while(thalers > 1)
|
while(thalers > 1)
|
||||||
thalers -= 1
|
thalers -= 1
|
||||||
spawn_money(1, src.loc)
|
spawn_money(1, src.loc)
|
||||||
Destroy()
|
qdel(src)
|
||||||
|
|
||||||
|
|
||||||
/****************************************************
|
/****************************************************
|
||||||
@@ -630,7 +630,7 @@
|
|||||||
var/ourowner = owner
|
var/ourowner = owner
|
||||||
var/ourloc = parent_organ
|
var/ourloc = parent_organ
|
||||||
var/ourtag = organ_tag
|
var/ourtag = organ_tag
|
||||||
Destroy()
|
qdel(src)
|
||||||
new newpath(ourowner, TRUE, ourloc, ourtag)
|
new newpath(ourowner, TRUE, ourloc, ourtag)
|
||||||
cooldown = rand(2,5)
|
cooldown = rand(2,5)
|
||||||
else
|
else
|
||||||
|
|||||||
Reference in New Issue
Block a user