shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/origin/master' into syntheticbloods

Browse Source
This commit is contained in:
Poojawa
2019-07-31 19:24:39 -05:00
parent 7738c97b80 3d597ea508
commit 3499d73f6b
1257 changed files with 31159 additions and 17321 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_citadel/code/game/objects/items/devices/PDA/PDA.dm
-4
View File
@@ -1,4 +0,0 @@
//Overrides TG's PDA sprites with Cit's PDA sprites. Remind me to turn this into a pref somewhere down the line.
/obj/item/pda
icon = 'modular_citadel/icons/obj/pda.dmi'
modular_citadel/code/game/objects/items/devices/flashlight.dm
-31
View File
@@ -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
modular_citadel/code/game/objects/items/holy_weapons.dm
+2 -2
View File
@@ -11,8 +11,8 @@
/obj/item/nullrod/rosary/Initialize()
.=..()
if(SSreligion.religion)
deity_name = SSreligion.deity
if(GLOB.religion)
deity_name = GLOB.deity
/obj/item/nullrod/rosary/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob)
if(!istype(M))
modular_citadel/code/game/objects/items/melee/eutactic_blades.dm
+5 -5
View File
@@ -119,8 +119,8 @@
/obj/item/melee/transforming/energy/sword/cx/attackby(obj/item/W, mob/living/user, params)
if(istype(W, /obj/item/melee/transforming/energy/sword/cx))
if((W.item_flags & NODROP) || (item_flags & NODROP))
to_chat(user, "<span class='warning'>\the [item_flags & NODROP ? src : W] is stuck to your hand, you can't attach it to \the [item_flags & NODROP ? W : src]!</span>")
if(HAS_TRAIT(W, TRAIT_NODROP) || HAS_TRAIT(src, TRAIT_NODROP))
to_chat(user, "<span class='warning'>\the [HAS_TRAIT(src, TRAIT_NODROP) ? src : W] is stuck to your hand, you can't attach it to \the [HAS_TRAIT(src, TRAIT_NODROP) ? W : src]!</span>")
return
else
to_chat(user, "<span class='notice'>You combine the two light swords, making a single supermassive blade! You're cool.</span>")
@@ -228,8 +228,8 @@
/obj/item/toy/sword/cx/attackby(obj/item/W, mob/living/user, params)
if(istype(W, /obj/item/toy/sword/cx))
if((W.item_flags & NODROP) || (item_flags & NODROP))
to_chat(user, "<span class='warning'>\the [item_flags & NODROP ? src : W] is stuck to your hand, you can't attach it to \the [item_flags & NODROP ? W : src]!</span>")
if(HAS_TRAIT(W, TRAIT_NODROP) || HAS_TRAIT(src, TRAIT_NODROP))
to_chat(user, "<span class='warning'>\the [HAS_TRAIT(src, TRAIT_NODROP) ? src : W] is stuck to your hand, you can't attach it to \the [HAS_TRAIT(src, TRAIT_NODROP) ? W : src]!</span>")
return
else
to_chat(user, "<span class='notice'>You combine the two plastic swords, making a single supermassive toy! You're fake-cool.</span>")
@@ -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
modular_citadel/code/game/objects/items/melee/misc.dm
+1 -1
View File
@@ -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))