Overhauls and 2/28 sync (#244)

* map tweaks/shuttle engines * helpers and defines * global/onclick * controllers and datums * mapping * game folder * some other stuff * some modules * modules that aren't mobs * some mob stuff * new player stuff * mob living * silicon stuff * simple animal things * carbon/ayylmao * update_icons * carbon/human * sounds and tools * icons and stuff * hippie grinder changes + tgui * kitchen.dmi * compile issues fixed * mapfix * Mapfixes 2.0 * mapedit2.0 * mapmerger pls * Revert "mapedit2.0" This reverts commit 74139a3cacea10df7aafca06c0a10bd3daf3a481. * clean up vore folder + 2 hotfixes * admin ticket refinement * Blob tweaks and LAZYADD * LAZYADD IS LAZY * Magic strings purged * DEFINES NEED HIGHER PRIORITIES * Only a sleepless idiot deals in absolute TRUE|FALSE * u h g * progress bar fix * reverts ticket logs * there's always that one guy * fixes and stuff * 2/27 fixes * game folder stuff * stats * some modules again * clothing stuff gets vg clothing out of the main files * everything not mobs again * mob stuff * maps, tgui, sql stuff * icons * additional fixes and compile errors * don't need this anymore * Oh right this isn't needed anymore * maint bar re-added * that doesn't need to be here * stupid events * wtfeven * probably makes Travis happy * don't care to fix the grinder atm * fixes vending sprites, changes turret * lethal, not lethals * overylays are finicky creatures * lazy fix for bleeding edgy (#252) * map tweaks/shuttle engines * helpers and defines * global/onclick * controllers and datums * mapping * game folder * some other stuff * some modules * modules that aren't mobs * some mob stuff * new player stuff * mob living * silicon stuff * simple animal things * carbon/ayylmao * update_icons * carbon/human * sounds and tools * icons and stuff * hippie grinder changes + tgui * kitchen.dmi * compile issues fixed * mapfix * Mapfixes 2.0 * mapedit2.0 * mapmerger pls * Revert "mapedit2.0" This reverts commit 74139a3cacea10df7aafca06c0a10bd3daf3a481. * clean up vore folder + 2 hotfixes * admin ticket refinement * Blob tweaks and LAZYADD * LAZYADD IS LAZY * Magic strings purged * DEFINES NEED HIGHER PRIORITIES * Only a sleepless idiot deals in absolute TRUE|FALSE * u h g * progress bar fix * reverts ticket logs * there's always that one guy * fixes and stuff * 2/27 fixes * game folder stuff * stats * some modules again * clothing stuff gets vg clothing out of the main files * everything not mobs again * mob stuff * maps, tgui, sql stuff * icons * additional fixes and compile errors * don't need this anymore * Oh right this isn't needed anymore * maint bar re-added * that doesn't need to be here * stupid events * wtfeven * probably makes Travis happy * don't care to fix the grinder atm * fixes vending sprites, changes turret * lethal, not lethals * overylays are finicky creatures
2017-02-28 09:30:49 -06:00
parent 93782cf716
commit 0bca862419
544 changed files with 309981 additions and 81206 deletions
@@ -3,7 +3,6 @@
 //The effects include: stunned, weakened, paralysis, sleeping, resting, jitteriness, dizziness, ear damage,
 // eye damage, eye_blind, eye_blurry, druggy, BLIND disability, and NEARSIGHT disability.

-
 /////////////////////////////////// STUNNED ////////////////////////////////////

 /mob/proc/Stun(amount, updating = 1, ignore_canstun = 0)
@@ -11,18 +10,21 @@
 		stunned = max(max(stunned,amount),0) //can't go below 0, getting a low amount of stun doesn't lower your current stun
 		if(updating)
 			update_canmove()
+		return TRUE

 /mob/proc/SetStunned(amount, updating = 1, ignore_canstun = 0) //if you REALLY need to set stun to a set amount without the whole "can't go below current stunned"
 	if(status_flags & CANSTUN || ignore_canstun)
 		stunned = max(amount,0)
 		if(updating)
 			update_canmove()
+		return TRUE

 /mob/proc/AdjustStunned(amount, updating = 1, ignore_canstun = 0)
 	if(status_flags & CANSTUN || ignore_canstun)
 		stunned = max(stunned + amount,0)
 		if(updating)
 			update_canmove()
+		return TRUE

 /////////////////////////////////// WEAKENED ////////////////////////////////////

@@ -31,18 +33,21 @@
 		weakened = max(max(weakened,amount),0)
 		if(updating)
 			update_canmove()	//updates lying, canmove and icons
+		return TRUE

 /mob/proc/SetWeakened(amount, updating = 1, ignore_canweaken = 0)
 	if(status_flags & CANWEAKEN)
 		weakened = max(amount,0)
 		if(updating)
 			update_canmove()	//updates lying, canmove and icons
+		return TRUE

 /mob/proc/AdjustWeakened(amount, updating = 1, ignore_canweaken = 0)
 	if((status_flags & CANWEAKEN) || ignore_canweaken)
 		weakened = max(weakened + amount,0)
 		if(updating)
 			update_canmove()	//updates lying, canmove and icons
+		return TRUE

 /////////////////////////////////// PARALYSIS ////////////////////////////////////

@@ -53,6 +58,7 @@
 		if((!old_paralysis && paralysis) || (old_paralysis && !paralysis))
 			if(updating)
 				update_stat()
+		return TRUE

 /mob/proc/SetParalysis(amount, updating = 1, ignore_canparalyse = 0)
 	if(status_flags & CANPARALYSE || ignore_canparalyse)
@@ -61,6 +67,7 @@
 		if((!old_paralysis && paralysis) || (old_paralysis && !paralysis))
 			if(updating)
 				update_stat()
+		return TRUE

 /mob/proc/AdjustParalysis(amount, updating = 1, ignore_canparalyse = 0)
 	if(status_flags & CANPARALYSE || ignore_canparalyse)
@@ -69,6 +76,7 @@
 		if((!old_paralysis && paralysis) || (old_paralysis && !paralysis))
 			if(updating)
 				update_stat()
+		return TRUE

 /////////////////////////////////// SLEEPING ////////////////////////////////////