cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-26 22:42:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into development

Browse Source
This commit is contained in:
skull132
2017-08-07 23:56:04 +03:00
parent 81bb348a42 f9076f48f2
commit ff44b44e14
11 changed files with 52 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/storage/boxes.dm
+21 -21
View File
@@ -158,22 +158,22 @@
desc = "A box full of syringes."
icon_state = "syringe"
New()
..()
new /obj/item/weapon/reagent_containers/syringe( src )
new /obj/item/weapon/reagent_containers/syringe( src )
new /obj/item/weapon/reagent_containers/syringe( src )
new /obj/item/weapon/reagent_containers/syringe( src )
new /obj/item/weapon/reagent_containers/syringe( src )
new /obj/item/weapon/reagent_containers/syringe( src )
new /obj/item/weapon/reagent_containers/syringe( src )
/obj/item/weapon/storage/box/syringes/fill()
..()
new /obj/item/weapon/reagent_containers/syringe( src )
new /obj/item/weapon/reagent_containers/syringe( src )
new /obj/item/weapon/reagent_containers/syringe( src )
new /obj/item/weapon/reagent_containers/syringe( src )
new /obj/item/weapon/reagent_containers/syringe( src )
new /obj/item/weapon/reagent_containers/syringe( src )
new /obj/item/weapon/reagent_containers/syringe( src )
/obj/item/weapon/storage/box/syringegun
name = "box of syringe gun cartridges"
desc = "A box full of compressed gas cartridges."
icon_state = "syringe"
/obj/item/weapon/storage/box/syringes/fill()
/obj/item/weapon/storage/box/syringegun/fill()
..()
new /obj/item/weapon/syringe_cartridge( src )
new /obj/item/weapon/syringe_cartridge( src )
@@ -509,7 +509,7 @@
/obj/item/weapon/storage/box/cups
name = "box of paper cups"
desc = "It has pictures of paper cups on the front."
/obj/item/weapon/storage/box/cups/fill()
..()
new /obj/item/weapon/reagent_containers/food/drinks/sillycup( src )
@@ -554,7 +554,7 @@
icon = 'icons/obj/food.dmi'
icon_state = "monkeycubebox"
can_hold = list(/obj/item/weapon/reagent_containers/food/snacks/monkeycube)
/obj/item/weapon/storage/box/monkeycubes/fill()
..()
if(src.type == /obj/item/weapon/storage/box/monkeycubes)
@@ -564,7 +564,7 @@
/obj/item/weapon/storage/box/monkeycubes/farwacubes
name = "farwa cube box"
desc = "Drymate brand farwa cubes, shipped from Adhomai. Just add water!"
/obj/item/weapon/storage/box/monkeycubes/farwacubes/fill()
..()
for(var/i = 1; i <= 5; i++)
@@ -573,7 +573,7 @@
/obj/item/weapon/storage/box/monkeycubes/stokcubes
name = "stok cube box"
desc = "Drymate brand stok cubes, shipped from Moghes. Just add water!"
/obj/item/weapon/storage/box/monkeycubes/stokcubes/fill()
..()
for(var/i = 1; i <= 5; i++)
@@ -582,7 +582,7 @@
/obj/item/weapon/storage/box/monkeycubes/neaeracubes
name = "neaera cube box"
desc = "Drymate brand neaera cubes, shipped from Jargon 4. Just add water!"
/obj/item/weapon/storage/box/monkeycubes/neaeracubes/fill()
..()
for(var/i = 1; i <= 5; i++)
@@ -632,13 +632,13 @@
new /obj/item/weapon/handcuffs(src)
new /obj/item/weapon/handcuffs(src)
new /obj/item/weapon/handcuffs(src)
/obj/item/weapon/storage/box/zipties
name = "box of zipties"
desc = "A box full of zipties."
icon_state = "handcuff"
/obj/item/weapon/storage/box/handcuffs/fill()
/obj/item/weapon/storage/box/zipties/fill()
..()
new /obj/item/weapon/handcuffs/ziptie(src)
new /obj/item/weapon/handcuffs/ziptie(src)
@@ -679,7 +679,7 @@
/obj/item/weapon/storage/box/spraybottles
name = "box of spray bottles"
desc = "It has pictures of spray bottles on its front."
/obj/item/weapon/storage/box/spraybottles/fill()
..()
new /obj/item/weapon/reagent_containers/spray( src )
@@ -696,12 +696,12 @@
icon = 'icons/obj/toy.dmi'
icon_state = "spbox"
can_hold = list(/obj/item/toy/snappop)
/obj/item/weapon/storage/box/snappops/fill()
..()
for(var/i=1; i <= 8; i++)
new /obj/item/toy/snappop(src)
/obj/item/weapon/storage/box/matches
name = "matchbox"
desc = "A small box of 'Space-Proof' premium matches."
@@ -730,7 +730,7 @@
name = "box of injectors"
desc = "Contains autoinjectors."
icon_state = "syringe"
/obj/item/weapon/storage/box/autoinjectors/fill()
..()
for (var/i; i < 7; i++)
code/game/objects/items/weapons/storage/uplink_kits.dm
+10 -3
View File
@@ -166,7 +166,7 @@
new /obj/item/device/spy_monitor(src)
/obj/item/weapon/storage/box/syndie_kit/g9mm
name = "\improper Smooth operator"
name = "smooth operator"
desc = "9mm with silencer kit."
/obj/item/weapon/storage/box/syndie_kit/g9mm/fill()
@@ -184,7 +184,7 @@
new /obj/item/weapon/reagent_containers/syringe(src)
/obj/item/weapon/storage/box/syndie_kit/cigarette
name = "\improper Tricky smokes"
name = "tricky smokes"
desc = "Comes with the following brands of cigarettes, in this order: 2xFlash, 2xSmoke, 1xMindBreaker, 1xTricordrazine. Avoid mixing them up."
/obj/item/weapon/storage/box/syndie_kit/cigarette/fill()
@@ -225,7 +225,7 @@
C.reagents.add_reagent(reagent, reagents[reagent] * C.storage_slots)
/obj/item/weapon/storage/box/syndie_kit/ewar_voice
name = "Electrowarfare and Voice Synthesiser kit"
name = "electrowarfare and voice synthesiser kit"
desc = "Kit for confounding organic and synthetic entities alike."
/obj/item/weapon/storage/box/syndie_kit/ewar_voice/fill()
@@ -233,6 +233,13 @@
new /obj/item/rig_module/electrowarfare_suite(src)
new /obj/item/rig_module/voice(src)
/obj/item/weapon/storage/box/syndie_kit/armor
name = "boxed armor kit"
/obj/item/weapon/storage/box/syndie_kit/armor/fill()
..()
new /obj/item/clothing/suit/storage/vest/merc(src)
new /obj/item/clothing/head/helmet/merc(src)
/obj/item/weapon/storage/secure/briefcase/money
name = "suspicious briefcase"