Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit42

2019-06-24 16:48:15 +02:00
parent 093b0a15ed dcd74f899a
commit 67f00fc049
637 changed files with 17918 additions and 12263 deletions
@@ -1,31 +0,0 @@
-/obj/item/flashlight
-	light_color = "#FFCC66"
-	flashlight_power = 0.8
-
-/obj/item/flashlight/pen
-	light_color = "#FFDDCC"
-	flashlight_power = 0.3
-
-/obj/item/flashlight/seclite
-	light_color = "#CDDDFF"
-	flashlight_power = 0.9
-
-/obj/item/flashlight/lamp
-	light_color = "#FFDDBB"
-	flashlight_power = 0.8
-
-/obj/item/flashlight/flare
-	light_color = "#FA421A"
-	flashlight_power = 0.8
-
-/obj/item/flashlight/flare/torch
-	light_color = "#FAA44B"
-	flashlight_power = 0.8
-
-/obj/item/flashlight/lantern
-	light_color = "#FFAA44"
-	flashlight_power = 0.75
-
-/obj/item/flashlight/slime
-	light_color = "#FFEEAA"
-	flashlight_power = 0.6
@@ -367,7 +367,7 @@
 			unwield()
 			return
 	..()
-	if(user.has_trait(TRAIT_CLUMSY) && (wielded) && prob(40))
+	if(HAS_TRAIT(user, TRAIT_CLUMSY) && (wielded) && prob(40))
 		impale(user)
 		return

@@ -16,7 +16,7 @@
 		return //CIT CHANGE - ditto

 	add_fingerprint(user)
-	if((user.has_trait(TRAIT_CLUMSY)) && prob(50))
+	if((HAS_TRAIT(user, TRAIT_CLUMSY)) && prob(50))
 		to_chat(user, "<span class ='danger'>You club yourself over the head.</span>")
 		user.Knockdown(60 * force)
 		if(ishuman(user))