cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 20:16:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Made new sprites for light tube and glasses boxes. (Bulb boxes only have bulbs in them, tube boxes only have tubes.)

Browse Source 
Removed some awful descriptions from items which should not have descriptions.
See: paper, empty boxes.

Fixed a bug which would cause traitor packs to have an emergency O2 tank and breath mask in them.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2201 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
petethegoat@gmail.com
2011-09-14 15:21:45 +00:00
parent e209195b91
commit 84d995a01d
8 changed files with 155 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/defines/obj/storage.dm
+3 -4
View File
@@ -85,7 +85,6 @@
/obj/item/weapon/storage/box
name = "Box"
desc = "A nice looking box."
icon_state = "box"
item_state = "syringe_kit"
@@ -188,7 +187,7 @@
/obj/item/weapon/storage/firstaid/toxin
name = "Toxin First Aid"
desc = "Used to treat when you have a high amoutn of toxins in your body. Or atleast the box containing those things."
desc = "Used to treat when you have a high amoutn of toxins in your body."
icon_state = "antitoxin"
item_state = "firstaid-toxin"
@@ -213,7 +212,7 @@
/obj/item/weapon/storage/gl_kit
name = "Prescription Glasses"
desc = "This box contains nerd glasses."
icon_state = "id"
icon_state = "glasses"
item_state = "syringe_kit"
/obj/item/weapon/storage/handcuff_kit
@@ -224,7 +223,7 @@
/obj/item/weapon/storage/id_kit
name = "Spare IDs"
desc = "Has so many empty ID's."
desc = "Has so many empty IDs."
icon_state = "id"
item_state = "syringe_kit"
code/defines/obj/supplypacks.dm
+4 -4
View File
@@ -143,10 +143,10 @@
"/obj/item/weapon/storage/lightbox/tubes",
"/obj/item/weapon/storage/lightbox/tubes",
"/obj/item/weapon/storage/lightbox/tubes",
"/obj/item/weapon/storage/lightbox",
"/obj/item/weapon/storage/lightbox",
"/obj/item/weapon/storage/lightbox",
"/obj/item/weapon/storage/lightbox")
"/obj/item/weapon/storage/lightbox/tubes",
"/obj/item/weapon/storage/lightbox/tubes",
"/obj/item/weapon/storage/lightbox/bulbs",
"/obj/item/weapon/storage/lightbox/bulbs")
cost = 5
containertype = "/obj/crate"
containername = "Replacement lights"
code/defines/obj/weapon.dm
-1
View File
@@ -1022,7 +1022,6 @@
/obj/item/weapon/paper
name = "Paper"
desc = "It is made from wood."
icon = 'items.dmi'
icon_state = "paper"
var/info = null
code/game/jobs/jobprocs.dm
+16 -16
View File
@@ -265,7 +265,7 @@
src.equip_if_possible(new /obj/item/clothing/under/rank/geneticist(src), slot_w_uniform)
src.equip_if_possible(new /obj/item/device/pda/medical(src), slot_belt)
src.equip_if_possible(new /obj/item/weapon/storage/backpack/medic (src), slot_back)
src.equip_if_possible(new /obj/item/weapon/storage/box(src.back), slot_in_backpack)
src.equip_if_possible(new /obj/item/weapon/storage/box/survival(src.back), slot_in_backpack)
src.equip_if_possible(new /obj/item/clothing/shoes/white(src), slot_shoes)
src.equip_if_possible(new /obj/item/clothing/suit/labcoat/genetics(src), slot_wear_suit)
src.equip_if_possible(new /obj/item/device/flashlight/pen(src), slot_s_store)
@@ -284,7 +284,7 @@
if ("Clown")
src.equip_if_possible(new /obj/item/weapon/storage/backpack/clown (src), slot_back)
src.equip_if_possible(new /obj/item/weapon/storage/box(src.back), slot_in_backpack)
src.equip_if_possible(new /obj/item/weapon/storage/box/survival(src.back), slot_in_backpack)
src.equip_if_possible(new /obj/item/clothing/under/rank/clown(src), slot_w_uniform)
src.equip_if_possible(new /obj/item/device/pda/clown(src), slot_belt)
src.equip_if_possible(new /obj/item/clothing/shoes/clown_shoes(src), slot_shoes)
@@ -298,7 +298,7 @@
if ("Mime")
src.equip_if_possible(new /obj/item/weapon/storage/backpack(src), slot_back)
src.equip_if_possible(new /obj/item/weapon/storage/box(src.back), slot_in_backpack)
src.equip_if_possible(new /obj/item/weapon/storage/box/survival(src.back), slot_in_backpack)
src.equip_if_possible(new /obj/item/clothing/under/mime(src), slot_w_uniform)
src.equip_if_possible(new /obj/item/device/pda/mime(src), slot_belt)
src.equip_if_possible(new /obj/item/clothing/shoes/black(src), slot_shoes)
@@ -343,7 +343,7 @@
if ("Detective")
src.equip_if_possible(new /obj/item/device/radio/headset/headset_sec (src), slot_ears) // -- TLE
src.equip_if_possible(new /obj/item/weapon/storage/backpack(src), slot_back)
src.equip_if_possible(new /obj/item/weapon/storage/box(src.back), slot_in_backpack)
src.equip_if_possible(new /obj/item/weapon/storage/box/survival(src.back), slot_in_backpack)
src.equip_if_possible(new /obj/item/clothing/under/det(src), slot_w_uniform)
src.equip_if_possible(new /obj/item/device/pda/detective(src), slot_belt)
src.equip_if_possible(new /obj/item/clothing/shoes/brown(src), slot_shoes)
@@ -365,7 +365,7 @@
if ("Medical Doctor")
src.equip_if_possible(new /obj/item/device/radio/headset/headset_med (src), slot_ears) // -- TLE
src.equip_if_possible(new /obj/item/weapon/storage/backpack/medic (src), slot_back)
src.equip_if_possible(new /obj/item/weapon/storage/box(src.back), slot_in_backpack)
src.equip_if_possible(new /obj/item/weapon/storage/box/survival(src.back), slot_in_backpack)
src.equip_if_possible(new /obj/item/clothing/under/rank/medical(src), slot_w_uniform)
src.equip_if_possible(new /obj/item/clothing/shoes/white(src), slot_shoes)
src.equip_if_possible(new /obj/item/clothing/suit/labcoat(src), slot_wear_suit)
@@ -376,7 +376,7 @@
if ("Captain")
src.equip_if_possible(new /obj/item/device/radio/headset/heads/captain (src), slot_ears)
src.equip_if_possible(new /obj/item/weapon/storage/backpack(src), slot_back)
src.equip_if_possible(new /obj/item/weapon/storage/box(src.back), slot_in_backpack)
src.equip_if_possible(new /obj/item/weapon/storage/box/survival(src.back), slot_in_backpack)
src.equip_if_possible(new /obj/item/clothing/under/rank/captain(src), slot_w_uniform)
src.equip_if_possible(new /obj/item/device/pda/captain(src), slot_belt)
src.equip_if_possible(new /obj/item/clothing/suit/armor/captain(src), slot_wear_suit)
@@ -391,7 +391,7 @@
if ("Security Officer")
src.equip_if_possible(new /obj/item/device/radio/headset/headset_sec (src), slot_ears) // -- TLE
src.equip_if_possible(new /obj/item/weapon/storage/backpack/security (src), slot_back)
src.equip_if_possible(new /obj/item/weapon/storage/box(src.back), slot_in_backpack)
src.equip_if_possible(new /obj/item/weapon/storage/box/survival(src.back), slot_in_backpack)
src.equip_if_possible(new /obj/item/clothing/under/rank/security(src), slot_w_uniform)
src.equip_if_possible(new /obj/item/device/pda/security(src), slot_belt)
src.equip_if_possible(new /obj/item/clothing/suit/armor/vest(src), slot_wear_suit)
@@ -406,7 +406,7 @@
if ("Warden")
src.equip_if_possible(new /obj/item/device/radio/headset/headset_sec (src), slot_ears) // -- TLE
src.equip_if_possible(new /obj/item/weapon/storage/backpack/security (src), slot_back)
src.equip_if_possible(new /obj/item/weapon/storage/box(src.back), slot_in_backpack)
src.equip_if_possible(new /obj/item/weapon/storage/box/survival(src.back), slot_in_backpack)
src.equip_if_possible(new /obj/item/clothing/under/rank/warden(src), slot_w_uniform)
src.equip_if_possible(new /obj/item/device/pda/security(src), slot_belt)
src.equip_if_possible(new /obj/item/clothing/suit/armor/vest(src), slot_wear_suit)
@@ -441,7 +441,7 @@
src.equip_if_possible(new /obj/item/clothing/head/helmet/HoS(src), slot_head)
src.equip_if_possible(new /obj/item/clothing/mask/gas/emergency(src), slot_wear_mask)
src.equip_if_possible(new /obj/item/weapon/storage/backpack/security (src), slot_back)
src.equip_if_possible(new /obj/item/weapon/storage/box(src.back), slot_in_backpack)
src.equip_if_possible(new /obj/item/weapon/storage/box/survival(src.back), slot_in_backpack)
src.equip_if_possible(new /obj/item/clothing/glasses/sunglasses/sechud(src), slot_glasses)
src.equip_if_possible(new /obj/item/weapon/handcuffs(src), slot_in_backpack)
src.equip_if_possible(new /obj/item/weapon/gun/energy(src), slot_s_store)
@@ -453,7 +453,7 @@
if ("Head of Personnel")
src.equip_if_possible(new /obj/item/device/radio/headset/heads/hop (src), slot_ears) // -- TLE
src.equip_if_possible(new /obj/item/weapon/storage/backpack(src), slot_back)
src.equip_if_possible(new /obj/item/weapon/storage/box(src.back), slot_in_backpack)
src.equip_if_possible(new /obj/item/weapon/storage/box/survival(src.back), slot_in_backpack)
src.equip_if_possible(new /obj/item/clothing/under/rank/head_of_personnel(src), slot_w_uniform)
src.equip_if_possible(new /obj/item/device/pda/heads/hop(src), slot_belt)
src.equip_if_possible(new /obj/item/clothing/suit/armor/vest(src), slot_wear_suit)
@@ -472,7 +472,7 @@
src.equip_if_possible(new /obj/item/clothing/shoes/black(src), slot_shoes)
src.equip_if_possible(new /obj/item/clothing/suit/armor/vest(src), slot_wear_suit)
src.equip_if_possible(new /obj/item/weapon/storage/backpack(src), slot_back)
src.equip_if_possible(new /obj/item/weapon/storage/box(src.back), slot_in_backpack)
src.equip_if_possible(new /obj/item/weapon/storage/box/survival(src.back), slot_in_backpack)
src.equip_if_possible(new /obj/item/ammo_casing/shotgun/beanbag(src), slot_in_backpack)
src.equip_if_possible(new /obj/item/ammo_casing/shotgun/beanbag(src), slot_in_backpack)
src.equip_if_possible(new /obj/item/ammo_casing/shotgun/beanbag(src), slot_in_backpack)
@@ -490,7 +490,7 @@
src.equip_if_possible(new /obj/item/device/pda/engineering(src), slot_belt)
src.equip_if_possible(new /obj/item/clothing/shoes/black(src), slot_shoes)
src.equip_if_possible(new /obj/item/weapon/storage/backpack(src), slot_back)
src.equip_if_possible(new /obj/item/weapon/storage/box(src.back), slot_in_backpack)
src.equip_if_possible(new /obj/item/weapon/storage/box/survival(src.back), slot_in_backpack)
src.equip_if_possible(new /obj/item/clothing/suit/labcoat(src), slot_wear_suit)
src.equip_if_possible(new /obj/item/clothing/gloves/black(src), slot_gloves)
src.equip_if_possible(new /obj/item/weapon/storage/toolbox/mechanical(src), slot_l_hand)
@@ -519,7 +519,7 @@
src.equip_if_possible(new /obj/item/device/pda/lawyer(src), slot_belt)
src.equip_if_possible(new /obj/item/clothing/shoes/brown(src), slot_shoes)
src.equip_if_possible(new /obj/item/weapon/storage/backpack(src), slot_back)
src.equip_if_possible(new /obj/item/weapon/storage/box(src.back), slot_in_backpack)
src.equip_if_possible(new /obj/item/weapon/storage/box/survival(src.back), slot_in_backpack)
src.equip_if_possible(new /obj/item/device/detective_scanner(src), slot_in_backpack)//Why do they even get this?
src.equip_if_possible(new /obj/item/weapon/storage/briefcase(src), slot_l_hand)
@@ -567,7 +567,7 @@
if ("Chief Medical Officer")
src.equip_if_possible(new /obj/item/device/radio/headset/heads/cmo (src), slot_ears)
src.equip_if_possible(new /obj/item/weapon/storage/backpack/medic (src), slot_back)
src.equip_if_possible(new /obj/item/weapon/storage/box(src.back), slot_in_backpack)
src.equip_if_possible(new /obj/item/weapon/storage/box/survival(src.back), slot_in_backpack)
src.equip_if_possible(new /obj/item/clothing/shoes/brown(src), slot_shoes)
src.equip_if_possible(new /obj/item/clothing/under/rank/chief_medical_officer(src), slot_w_uniform)
src.equip_if_possible(new /obj/item/device/pda/heads/cmo(src), slot_belt)
@@ -578,7 +578,7 @@
if ("Virologist")
src.equip_if_possible(new /obj/item/device/radio/headset/headset_medsci (src), slot_ears) // -- TLE
src.equip_if_possible(new /obj/item/weapon/storage/backpack/medic (src), slot_back)
src.equip_if_possible(new /obj/item/weapon/storage/box(src.back), slot_in_backpack)
src.equip_if_possible(new /obj/item/weapon/storage/box/survival(src.back), slot_in_backpack)
src.equip_if_possible(new /obj/item/clothing/under/rank/medical(src), slot_w_uniform)
src.equip_if_possible(new /obj/item/device/pda/medical(src), slot_belt)
src.equip_if_possible(new /obj/item/clothing/mask/surgical(src), slot_wear_mask)
@@ -641,7 +641,7 @@
return
src.equip_if_possible(new /obj/item/device/radio/headset(src), slot_ears)
var/obj/item/weapon/storage/backpack/BPK = new/obj/item/weapon/storage/backpack(src)
new /obj/item/weapon/storage/box(BPK)
new /obj/item/weapon/storage/box/survival(BPK)
src.equip_if_possible(BPK, slot_back,1)
/*
spawn(10)
code/game/objects/storage/storage.dm
+5 -2
View File
@@ -212,11 +212,14 @@
src.master.attackby(W, user)
return
/obj/item/weapon/storage/box/New()
/obj/item/weapon/storage/box/
/obj/item/weapon/storage/box/survival/New()
..()
contents = list()
sleep(1)
new /obj/item/clothing/mask/breath( src )
new /obj/item/weapon/tank/emergency_oxygen( src )
..()
return
/obj/item/weapon/storage/box/engineer/New()
code/modules/power/lighting.dm
+9 -5
View File
@@ -523,21 +523,25 @@
// a box of replacement light items
/obj/item/weapon/storage/lightbox
name = "replacement lights"
name = "replacement bulbs"
icon = 'storage.dmi'
icon_state = "light"
item_state = "syringe_kit"
/obj/item/weapon/storage/lightbox/New()
/obj/item/weapon/storage/lightbox/bulbs/New()
..()
new /obj/item/weapon/light/tube(src)
new /obj/item/weapon/light/tube(src)
new /obj/item/weapon/light/tube(src)
new /obj/item/weapon/light/bulb(src)
new /obj/item/weapon/light/bulb(src)
new /obj/item/weapon/light/bulb(src)
new /obj/item/weapon/light/bulb(src)
new /obj/item/weapon/light/bulb(src)
new /obj/item/weapon/light/bulb(src)
/obj/item/weapon/storage/lightbox/tubes
name = "replacement tubes"
icon_state = "lighttube"
/obj/item/weapon/storage/lightbox/tubes/New()
..()
new /obj/item/weapon/light/tube(src)