cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2387 from comma/master

Browse Source 
Fixes issue #2384
This commit is contained in:
Christian Bielert
2013-02-20 10:54:04 -08:00
parent b1272bb987 28c8c67946
commit d43b798474
4 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/game/gamemodes/game_mode.dm
View File

@@ -64,8 +64,8 @@ Whitespace:Seperator;
Implants; Implants;
/obj/item/weapon/storage/box/syndie_kit/imp_freedom:3:Freedom Implant; /obj/item/weapon/storage/box/syndie_kit/imp_freedom:3:Freedom Implant;
/obj/item/weapon/storage/box/syndie_kit/imp_uplink:10:Uplink Implant (Contains 5 Telecrystals); /obj/item/weapon/storage/box/syndie_kit/imp_uplink:10:Uplink Implant (Contains 5 Telecrystals);
/obj/item/weapon/implant/explosive:6:Explosive Implant (DANGER!); /obj/item/weapon/storage/box/syndie_kit/imp_explosive:6:Explosive Implant (DANGER!);
/obj/item/weapon/implant/compressed:4:Compressed Matter Implant;Whitespace:Seperator; /obj/item/weapon/storage/box/syndie_kit/imp_compress:4:Compressed Matter Implant;Whitespace:Seperator;
(Pointless) Badassery; (Pointless) Badassery;
/obj/item/toy/syndicateballoon:10:For showing that You Are The BOSS (Useless Balloon);"} /obj/item/toy/syndicateballoon:10:For showing that You Are The BOSS (Useless Balloon);"}

6
code/game/objects/items/weapons/implants/implanter.dm
View File

@@ -83,7 +83,7 @@
/obj/item/weapon/implanter/compressed /obj/item/weapon/implanter/compressed
name = "implanter (C)" name = "implanter (C)"
icon_state = "cimplanter0" icon_state = "cimplanter1"
/obj/item/weapon/implanter/compressed/New() /obj/item/weapon/implanter/compressed/New()
imp = new /obj/item/weapon/implant/compressed( src ) imp = new /obj/item/weapon/implant/compressed( src )
@@ -95,11 +95,11 @@
if (imp) if (imp)
var/obj/item/weapon/implant/compressed/c = imp var/obj/item/weapon/implant/compressed/c = imp
if(!c.scanned) if(!c.scanned)
icon_state = "cimplanter0"
else
icon_state = "cimplanter1" icon_state = "cimplanter1"
else else
icon_state = "cimplanter2" icon_state = "cimplanter2"
else
icon_state = "cimplanter0"
return return
/obj/item/weapon/implanter/compressed/attack(mob/M as mob, mob/user as mob) /obj/item/weapon/implanter/compressed/attack(mob/M as mob, mob/user as mob)

19
code/game/objects/items/weapons/storage/uplink_kits.dm
View File

@@ -83,24 +83,21 @@
O.update() O.update()
return return
/*/obj/item/weapon/storage/box/syndie_kit/imp_compress /obj/item/weapon/storage/box/syndie_kit/imp_compress
name = "Compressed Matter Implant (with injector)" name = "box (C)"
/obj/item/weapon/storage/syndie_kit/imp_compress/New() /obj/item/weapon/storage/box/syndie_kit/imp_compress/New()
new /obj/item/weapon/implanter/compressed(src) new /obj/item/weapon/implanter/compressed(src)
..() ..()
return return
/obj/item/weapon/storage/syndie_kit/imp_explosive /obj/item/weapon/storage/box/syndie_kit/imp_explosive
name = "Explosive Implant (with injector)" name = "box (E)"
/obj/item/weapon/storage/syndie_kit/imp_explosive/New() /obj/item/weapon/storage/box/syndie_kit/imp_explosive/New()
var/obj/item/weapon/implanter/O = new /obj/item/weapon/implanter(src) new /obj/item/weapon/implanter/explosive(src)
O.imp = new /obj/item/weapon/implant/explosive(O)
O.name = "(BIO-HAZARD) BIO-detpack"
O.update()
..() ..()
return*/ return
/obj/item/weapon/storage/box/syndie_kit/imp_uplink /obj/item/weapon/storage/box/syndie_kit/imp_uplink
name = "Uplink Implant (with injector)" name = "Uplink Implant (with injector)"

BIN
icons/obj/items.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 56 KiB

After

Width:  |  Height:  |  Size: 57 KiB