- yellow, blue, orange and red hardhats added

- the 'box' item no longer contains internals by default. A survival kit does tho.
- backpacks no longer contain a box, the backpacks which spawn as part of your kit at round start/late join contain a survival kit (box), which contains internals.
- engineers spawn with a different survival kit, which has an engineering em. oxy tank
- emergency oxy tanks now fit in boxes again
- engineering emergency oxygen tank (yellow) added (engineers spawn with it in their internals box), double emergency oxy tank added (not ingame yet), red and yellow oxygen tanks added (red spawns in firefighting closets, yellow is not ingame) (sprites by Aru)
- red hardhats spawn in fire closets
- CE spawns with white hardhat, one is also in his locker
- CE spawns with industrial backpack
- Pod people manual added to HOP's desk (he's the boss) and hydroponics
- Ore pile removed from code (was not used for anything and I don't want it to be)
- The mechanical and electrical toolbox in tool storage replaced with two tool closets. (We'll see if this works out)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1775 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
baloh.matevz
2011-07-05 19:45:47 +00:00
parent ebcdc09c10
commit f8f5ff2dc3
26 changed files with 151 additions and 49 deletions
+23 -2
View File
@@ -290,13 +290,34 @@
/obj/item/clothing/head/helmet/hardhat
name = "hard hat"
desc = "A hat which appears to be very hard."
icon_state = "hardhat0"
icon_state = "hardhat0_yellow"
flags = FPRINT | TABLEPASS | SUITSPACE
item_state = "hardhat0"
item_state = "hardhat0_yellow"
var/brightness_on = 4 //luminosity when on
var/on = 0
color = "yellow" //Determines used sprites: hardhat[on]_[color] and hardhat[on]_[color]2 (lying down sprite)
armor = list(melee = 30, bullet = 30, laser = 20, taser = 10, bomb = 20, bio = 10, rad = 20)
/obj/item/clothing/head/helmet/hardhat/orange
icon_state = "hardhat0_orange"
item_state = "hardhat0_orange"
color = "orange"
/obj/item/clothing/head/helmet/hardhat/red
icon_state = "hardhat0_red"
item_state = "hardhat0_red"
color = "red"
/obj/item/clothing/head/helmet/hardhat/white
icon_state = "hardhat0_white"
item_state = "hardhat0_white"
color = "white"
/obj/item/clothing/head/helmet/hardhat/dblue
icon_state = "hardhat0_dblue"
item_state = "hardhat0_dblue"
color = "dblue"
/obj/item/clothing/head/helmet/welding
name = "welding helmet"
+10 -1
View File
@@ -77,11 +77,20 @@
can_hold = list("/obj/item/weapon/dice")
/obj/item/weapon/storage/box
name = "box"
name = "Box"
desc = "A nice looking box."
icon_state = "box"
item_state = "syringe_kit"
/obj/item/weapon/storage/survival_kit
name = "Centcom Survival Kit"
desc = "How nice of CentCom to provide us with some stuff to make our lives easier."
icon_state = "box"
item_state = "syringe_kit"
/obj/item/weapon/storage/survival_kit/engineer
name = "Centcom Engineer Kit"
/obj/item/weapon/storage/pillbottlebox
name = "pill bottles"
desc = "A box of pill bottles."
+25 -5
View File
@@ -1435,6 +1435,16 @@ Total SMES charging rate should not exceed total power generation rate, or an ov
icon_state = "oxygen"
distribute_pressure = ONE_ATMOSPHERE*O2STANDARD
/obj/item/weapon/tank/oxygen/yellow
name = "Gas Tank (Oxygen)"
desc = "A tank of oxygen meant for firefighters."
icon_state = "oxygen_f"
/obj/item/weapon/tank/oxygen/red
name = "Gas Tank (Oxygen)"
desc = "A tank of oxygen meant for firefighters."
icon_state = "oxygen_fr"
/obj/item/weapon/tank/air
name = "Gas Tank (Air Mix)"
desc = "Mixed anyone?"
@@ -1442,18 +1452,28 @@ Total SMES charging rate should not exceed total power generation rate, or an ov
/obj/item/weapon/tank/plasma
name = "Gas Tank (BIOHAZARD)"
desc = "Contains dangerous plasma. When inhaled."
desc = "Contains dangerous plasma. Do not inhale."
icon_state = "plasma"
/obj/item/weapon/tank/emergency_oxygen
name = "emergency oxygentank"
desc = "Used for emergencies."
name = "Emergency Oxygen Tank"
desc = "Used for emergencies. Contains very little oxygen, so try to conserve it until you actualy need it."
icon_state = "emergency"
flags = FPRINT | TABLEPASS | ONBELT | CONDUCT
w_class = 2.5
w_class = 2.0
force = 4.0
distribute_pressure = ONE_ATMOSPHERE*O2STANDARD
volume = 10 //yeah, SO tiny
volume = 3 //Tiny. Real life equivalents only have 21 breaths of oxygen in them. They're EMERGENCY tanks anyway -errorage (dangercon 2011)
/obj/item/weapon/tank/emergency_oxygen/engi
icon_state = "emergency_engi"
name = "Engineering Emergency Oxygen Tank"
volume = 6 //Engineers are always superior. -errorage (dangercon 2011)
/obj/item/weapon/tank/emergency_oxygen/double
icon_state = "emergency_double"
name = "Double Emergency Oxygen Tank"
volume = 10 //These have the same emoung of gas in them as air tanks, but can be worn on your belt -errorage (dangercon 2011)
/obj/item/weapon/teleportation_scroll
name = "Teleportation Scroll"