cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

[BUG] Size update fixes

Browse Source
This commit is contained in:
Chompstation Bot
2021-03-12 13:28:52 +00:00
parent 6d07636d44
commit 59fdeb2e8e
4 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/modules/nifsoft/software/15_misc.dm
View File

@@ -130,7 +130,8 @@
var/new_size = input("Put the desired size (25-200%), or (1-600%) in dormitory areas.", "Set Size", 200) as num|null
if (!nif.human.size_range_check(new_size))
to_chat(nif.human,"<span class='notice'>The safety features of the NIF Program prevent you from choosing this size.</span>")
if(new_size)
to_chat(nif.human,"<span class='notice'>The safety features of the NIF Program prevent you from choosing this size.</span>")
return
else
if(nif.human.resize(new_size/100))

16
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Vore_vr.dm
View File

@@ -13,8 +13,16 @@
mrate_static = TRUE
/datum/reagent/macrocillin/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
<<<<<<< HEAD
if(M.size_multiplier < RESIZE_HUGE)
M.resize(M.size_multiplier+0.01, FALSE)//Incrrease 1% per tick. //CHOMP Edit: don't do fancy animates. Unnecessary on 1% changes. Laggy.
||||||| parent of e41b0b22f6... Merge pull request #9928 from Zap-zapper/master
if(M.size_multiplier < RESIZE_HUGE)
M.resize(M.size_multiplier+0.01)//Incrrease 1% per tick.
=======
if(M.size_range_check(M.size_multiplier))
M.resize(M.size_multiplier+0.01)//Incrrease 1% per tick.
>>>>>>> e41b0b22f6... Merge pull request #9928 from Zap-zapper/master
return
/datum/reagent/microcillin
@@ -27,8 +35,16 @@
mrate_static = TRUE
/datum/reagent/microcillin/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
<<<<<<< HEAD
if(M.size_multiplier > RESIZE_TINY)
M.resize(M.size_multiplier-0.01, FALSE) //Decrease 1% per tick. //CHOMP Edit: don't do fancy animates. Unnecessary on 1% changes. Laggy.
||||||| parent of e41b0b22f6... Merge pull request #9928 from Zap-zapper/master
if(M.size_multiplier > RESIZE_TINY)
M.resize(M.size_multiplier-0.01) //Decrease 1% per tick.
=======
if(M.size_range_check(M.size_multiplier))
M.resize(M.size_multiplier-0.01) //Decrease 1% per tick.
>>>>>>> e41b0b22f6... Merge pull request #9928 from Zap-zapper/master
return

2
code/modules/vore/resizing/resize_vr.dm
View File

@@ -144,7 +144,7 @@ var/const/RESIZE_A_SMALLTINY = (RESIZE_SMALL + RESIZE_TINY) / 2
var/nagmessage = "Adjust your mass to be a size between 25 to 200% (or 1% to 600% in dormitories). (DO NOT ABUSE)"
var/new_size = input(nagmessage, "Pick a Size") as num|null
if(new_size && ISINRANGE(new_size, 25, 200))
if(size_range_check(new_size))
resize(new_size/100)
// I'm not entirely convinced that `src ? ADMIN_JMP(src) : "null"` here does anything
// but just in case it does, I'm leaving the null-src checking

7
code/modules/vore/resizing/sizegun_vr.dm
View File

@@ -24,7 +24,10 @@
/obj/item/weapon/gun/energy/sizegun/New()
..()
verbs += /obj/item/weapon/gun/energy/sizegun/proc/select_size
if(istype(src, /obj/item/weapon/gun/energy/sizegun/admin))
verbs += /obj/item/weapon/gun/energy/sizegun/admin/select_size
else
verbs += /obj/item/weapon/gun/energy/sizegun/proc/select_size
/obj/item/weapon/gun/energy/sizegun/attack_self(mob/user)
. = ..()
@@ -65,7 +68,7 @@
var/size_select = input("Put the desired size", "Set Size", size_set_to * 100) as num
size_set_to = max(1,size_select/100) //No negative numbers
to_chat(usr, "<span class='notice'>You set the size to [size_set_to]%</span>")
to_chat(usr, "<span class='notice'>You set the size to [size_select]%</span>")
//
// Beams for size gun