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

makes it compile. should work. hopefully

Browse Source
This commit is contained in:
deathride58
2018-07-02 15:35:11 -04:00
parent 6873a7c065
commit f986f9c9f2
19 changed files with 37 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_citadel/code/game/objects/ids.dm
+1 -1
View File
@@ -52,7 +52,7 @@
desc = "A small cell with two prongs lazily jabbed into it. It looks like it's made for charging the small batteries found in electromagnetic devices."
icon = 'icons/obj/module.dmi'
icon_state = "cell_mini"
flags_1 = NOBLUDGEON_1
item_flags = NOBLUDGEON
var/uses = 5 //Dictates how many charges the device adds to compatible items
/obj/item/emagrecharge/examine(mob/user)
modular_citadel/code/game/objects/items/melee/eutactic_blades.dm
+3 -3
View File
@@ -206,8 +206,8 @@
/obj/item/toy/sword/cx/attackby(obj/item/W, mob/living/user, params)
if(istype(W, /obj/item/toy/sword/cx))
if((W.flags_1 & NODROP_1) || (flags_1 & NODROP_1))
to_chat(user, "<span class='warning'>\the [flags_1 & NODROP_1 ? src : W] is stuck to your hand, you can't attach it to \the [flags_1 & NODROP_1 ? W : src]!</span>")
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>")
return
else
to_chat(user, "<span class='notice'>You combine the two plastic swords, making a single supermassive toy! You're fake-cool.</span>")
@@ -307,7 +307,7 @@
var/mob/M = loc
M.update_inv_hands()
SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)//blood overlays get weird otherwise, because the sprite changes. (retained from original desword because I have no idea what this is)
SEND_SIGNAL(src, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)//blood overlays get weird otherwise, because the sprite changes. (retained from original desword because I have no idea what this is)
/obj/item/twohanded/hypereutactic/AltClick(mob/living/user)
if(!in_range(src, user)) //Basic checks to prevent abuse
modular_citadel/code/game/objects/items/vending_items.dm
-2
View File
@@ -1,5 +1,3 @@
/obj/item/vending_refill/medical
machine_name = "NanoMed"
icon_state = "refill_medical"
charges = list(32, 5, 3)// of 95 standard, 13 contraband, 8 premium
init_charges = list(32, 5, 3)