cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-28 07:39:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update 15_misc.dm

Browse Source
This commit is contained in:
Nadyr
2021-04-09 02:25:48 -04:00
committed by GitHub
parent f5dd6e85fa
commit bcf66850c1
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/nifsoft/software/15_misc.dm
-6
View File
@@ -134,13 +134,7 @@
to_chat(nif.human,"<span class='notice'>The safety features of the NIF Program prevent you from choosing this size.</span>")
return
else
<<<<<<< HEAD
if(nif.human.resize(new_size/100))
||||||| parent of 4c52a2cdd4... Merge pull request #10095 from ShadowLarkens/better_resize_guard
if(nif.human.resize(new_size/100, ignore_prefs = TRUE))
=======
if(nif.human.resize(new_size/100, uncapped=nif.human.has_large_resize_bounds(), ignore_prefs = TRUE))
>>>>>>> 4c52a2cdd4... Merge pull request #10095 from ShadowLarkens/better_resize_guard
to_chat(nif.human,"<span class='notice'>You set the size to [new_size]%</span>")
nif.human.visible_message("<span class='warning'>Swirling grey mist envelops [nif.human] as they change size!</span>","<span class='notice'>Swirling streams of nanites wrap around you as you change size!</span>")
spawn(0)