mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-19 11:05:03 +01:00
- 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
@@ -1063,13 +1063,6 @@ proc/move_mining_shuttle()
|
||||
pixel_x = rand(0,16)-8
|
||||
pixel_y = rand(0,8)-8
|
||||
|
||||
/**********************Ore pile (not used)**************************/
|
||||
|
||||
/obj/item/weapon/ore_pile
|
||||
name = "Pile of ores"
|
||||
icon = 'Mining.dmi'
|
||||
icon_state = "orepile"
|
||||
|
||||
/**********************Satchel**************************/
|
||||
|
||||
/obj/item/weapon/satchel
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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."
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -171,7 +171,7 @@ proc/countJob(rank)
|
||||
if(slot_in_backpack)
|
||||
if (src.back && istype(src.back, /obj/item/weapon/storage/backpack))
|
||||
var/obj/item/weapon/storage/backpack/B = src.back
|
||||
if(B.contents.len < 7 && W.w_class <= 3)
|
||||
if(B.contents.len < B.storage_slots && W.w_class <= B.max_w_class)
|
||||
W.loc = B
|
||||
equipped = 1
|
||||
if(slot_h_store)
|
||||
|
||||
@@ -198,6 +198,7 @@
|
||||
wizard_mob.equip_if_possible(new /obj/item/clothing/suit/wizrobe(wizard_mob), wizard_mob.slot_wear_suit)
|
||||
wizard_mob.equip_if_possible(new /obj/item/clothing/head/wizard(wizard_mob), wizard_mob.slot_head)
|
||||
wizard_mob.equip_if_possible(new /obj/item/weapon/storage/backpack(wizard_mob), wizard_mob.slot_back)
|
||||
wizard_mob.equip_if_possible(new /obj/item/weapon/storage/survival_kit(src), wizard_mob.slot_in_backpack)
|
||||
// wizard_mob.equip_if_possible(new /obj/item/weapon/scrying_gem(wizard_mob), wizard_mob.slot_l_store) For scrying gem.
|
||||
wizard_mob.equip_if_possible(new /obj/item/weapon/teleportation_scroll(wizard_mob), wizard_mob.slot_r_store)
|
||||
if(config.feature_object_spell_system) //if it's turned on (in config.txt), spawns an object spell spellbook
|
||||
@@ -233,7 +234,7 @@
|
||||
return 1
|
||||
|
||||
/datum/game_mode/proc/auto_declare_completion_wizard()
|
||||
for(var/datum/mind/wizard in wizards)
|
||||
for(var/datum/mind/wizard in wizards)
|
||||
var/wizard_name
|
||||
if(wizard.current)
|
||||
if(wizard.current == wizard.original)
|
||||
|
||||
@@ -301,6 +301,7 @@
|
||||
src.equip_if_possible(new /obj/item/device/radio/headset/headset_medsci (src), slot_ears) // -- TLE
|
||||
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/survival_kit(src), slot_in_backpack)
|
||||
src.equip_if_possible(new /obj/item/clothing/under/rank/geneticist(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)
|
||||
@@ -320,6 +321,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/survival_kit(src), slot_in_backpack)
|
||||
src.equip_if_possible(new /obj/item/device/pda/clown(src), slot_belt)
|
||||
src.equip_if_possible(new /obj/item/clothing/under/rank/clown(src), slot_w_uniform)
|
||||
src.equip_if_possible(new /obj/item/clothing/shoes/clown_shoes(src), slot_shoes)
|
||||
@@ -333,6 +335,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/survival_kit(src), slot_in_backpack)
|
||||
src.equip_if_possible(new /obj/item/device/pda/mime(src), slot_belt)
|
||||
src.equip_if_possible(new /obj/item/clothing/under/mime(src), slot_w_uniform)
|
||||
src.equip_if_possible(new /obj/item/clothing/shoes/black(src), slot_shoes)
|
||||
@@ -349,6 +352,7 @@
|
||||
|
||||
if ("Station Engineer")
|
||||
src.equip_if_possible(new /obj/item/weapon/storage/backpack/industrial (src), slot_back)
|
||||
src.equip_if_possible(new /obj/item/weapon/storage/survival_kit/engineer(src), slot_in_backpack)
|
||||
src.equip_if_possible(new /obj/item/device/radio/headset/headset_eng (src), slot_ears) // -- TLE
|
||||
src.equip_if_possible(new /obj/item/device/pda/engineering(src), slot_belt)
|
||||
src.equip_if_possible(new /obj/item/clothing/under/rank/engineer(src), slot_w_uniform)
|
||||
@@ -360,6 +364,7 @@
|
||||
|
||||
if ("Shaft Miner")
|
||||
src.equip_if_possible(new /obj/item/weapon/storage/backpack/industrial (src), slot_back)
|
||||
src.equip_if_possible(new /obj/item/weapon/storage/survival_kit(src), slot_in_backpack)
|
||||
src.equip_if_possible(new /obj/item/device/radio/headset/headset_mine (src), slot_ears)
|
||||
src.equip_if_possible(new /obj/item/clothing/under/rank/miner(src), slot_w_uniform)
|
||||
src.equip_if_possible(new /obj/item/clothing/shoes/black(src), slot_shoes)
|
||||
@@ -374,6 +379,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/survival_kit(src), slot_in_backpack)
|
||||
src.equip_if_possible(new /obj/item/device/pda/security(src), slot_belt)
|
||||
src.equip_if_possible(new /obj/item/clothing/under/det(src), slot_w_uniform)
|
||||
src.equip_if_possible(new /obj/item/clothing/shoes/brown(src), slot_shoes)
|
||||
@@ -393,6 +399,7 @@
|
||||
src.equip_if_possible(new /obj/item/device/radio/headset/headset_med (src), slot_ears) // -- TLE
|
||||
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/survival_kit(src), 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)
|
||||
@@ -402,6 +409,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/survival_kit(src), slot_in_backpack)
|
||||
src.equip_if_possible(new /obj/item/device/pda/captain(src), slot_belt)
|
||||
src.equip_if_possible(new /obj/item/clothing/under/rank/captain(src), slot_w_uniform)
|
||||
src.equip_if_possible(new /obj/item/clothing/suit/armor/captain(src), slot_wear_suit)
|
||||
@@ -414,6 +422,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/survival_kit(src), slot_in_backpack)
|
||||
src.equip_if_possible(new /obj/item/device/pda/security(src), slot_belt)
|
||||
src.equip_if_possible(new /obj/item/clothing/under/rank/security(src), slot_w_uniform)
|
||||
src.equip_if_possible(new /obj/item/clothing/suit/armor/vest(src), slot_wear_suit)
|
||||
@@ -426,6 +435,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/survival_kit(src), slot_in_backpack)
|
||||
src.equip_if_possible(new /obj/item/device/pda/security(src), slot_belt)
|
||||
src.equip_if_possible(new /obj/item/clothing/under/rank/warden(src), slot_w_uniform)
|
||||
src.equip_if_possible(new /obj/item/clothing/suit/armor/vest(src), slot_wear_suit)
|
||||
@@ -456,6 +466,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/survival_kit(src), slot_in_backpack)
|
||||
src.equip_if_possible(new /obj/item/clothing/glasses/sunglasses(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)
|
||||
@@ -464,6 +475,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/survival_kit(src), slot_in_backpack)
|
||||
src.equip_if_possible(new /obj/item/device/pda/heads/hop(src), slot_belt)
|
||||
src.equip_if_possible(new /obj/item/clothing/under/rank/head_of_personnel(src), slot_w_uniform)
|
||||
src.equip_if_possible(new /obj/item/clothing/suit/armor/vest(src), slot_wear_suit)
|
||||
@@ -482,6 +494,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/survival_kit(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)
|
||||
src.equip_if_possible(new /obj/item/ammo_casing/shotgun/beanbag(src), slot_in_backpack)
|
||||
@@ -499,6 +512,7 @@
|
||||
src.equip_if_possible(new /obj/item/clothing/under/rank/roboticist(src), slot_w_uniform)
|
||||
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/survival_kit(src), 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)
|
||||
@@ -521,6 +535,7 @@
|
||||
src.equip_if_possible(new /obj/item/clothing/shoes/brown(src), slot_shoes)
|
||||
src.equip_if_possible(new /obj/item/clothing/suit/suit(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/survival_kit(src), slot_in_backpack)
|
||||
src.equip_if_possible(new /obj/item/device/detective_scanner(src), slot_in_backpack)
|
||||
src.equip_if_possible(new /obj/item/weapon/storage/briefcase(src), slot_l_hand)
|
||||
|
||||
@@ -541,11 +556,13 @@
|
||||
src.equip_if_possible(new /obj/item/device/pda/quartermaster(src), slot_belt)
|
||||
|
||||
if ("Chief Engineer")
|
||||
src.equip_if_possible(new /obj/item/weapon/storage/backpack/industrial (src), slot_back)
|
||||
src.equip_if_possible(new /obj/item/weapon/storage/survival_kit/engineer(src), slot_in_backpack)
|
||||
src.equip_if_possible(new /obj/item/device/radio/headset/heads/ce (src), slot_ears)
|
||||
src.equip_if_possible(new /obj/item/device/pda/heads/ce(src), slot_belt)
|
||||
src.equip_if_possible(new /obj/item/clothing/gloves/black(src), slot_gloves) //changed to black as part of dangercon 2011, approved by Urist_McDorf --Errorage
|
||||
src.equip_if_possible(new /obj/item/clothing/shoes/brown(src), slot_shoes)
|
||||
src.equip_if_possible(new /obj/item/clothing/head/helmet/hardhat(src), slot_head)
|
||||
src.equip_if_possible(new /obj/item/clothing/head/helmet/hardhat/white(src), slot_head)
|
||||
src.equip_if_possible(new /obj/item/weapon/storage/utilitybelt/full(src), slot_l_hand) //currently spawns in hand due to traitor assignment requiring a PDA to be on the belt. --Errorage
|
||||
var/obj/item/clothing/mask/cigarette/CIG = new /obj/item/clothing/mask/cigarette(src)
|
||||
CIG.light("")
|
||||
@@ -567,6 +584,7 @@
|
||||
src.equip_if_possible(new /obj/item/device/radio/headset/heads/cmo (src), slot_ears)
|
||||
src.equip_if_possible(new /obj/item/device/pda/heads/cmo(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/survival_kit(src), 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/clothing/suit/labcoat_cmo(src), slot_wear_suit)
|
||||
@@ -577,6 +595,7 @@
|
||||
src.equip_if_possible(new /obj/item/device/radio/headset/headset_medsci (src), slot_ears) // -- TLE
|
||||
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/survival_kit(src), 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/mask/surgical(src), slot_wear_mask)
|
||||
src.equip_if_possible(new /obj/item/clothing/shoes/white(src), slot_shoes)
|
||||
@@ -635,7 +654,9 @@
|
||||
src.Robotize()
|
||||
else
|
||||
src.equip_if_possible(new /obj/item/device/radio/headset(src), slot_ears)
|
||||
src.equip_if_possible(new /obj/item/weapon/storage/backpack(src), slot_back)
|
||||
var/obj/item/weapon/storage/backpack/BPK = new/obj/item/weapon/storage/backpack(src)
|
||||
BPK.contents += new /obj/item/weapon/storage/survival_kit(src)
|
||||
src.equip_if_possible(BPK, slot_back)
|
||||
|
||||
|
||||
/*
|
||||
|
||||
@@ -142,6 +142,7 @@
|
||||
new /obj/item/weapon/book/manual/engineering_hacking(src)
|
||||
new /obj/item/weapon/book/manual/engineering_guide(src)
|
||||
new /obj/item/weapon/book/manual/engineering_singularity_safety(src)
|
||||
new /obj/item/weapon/book/manual/robotics_cyborgs(src)
|
||||
|
||||
/obj/bookcase/manuals/research_and_development
|
||||
name = "R&D Manuals bookcase"
|
||||
|
||||
@@ -6,17 +6,18 @@
|
||||
new /obj/item/clothing/suit/fire/firefighter(src)
|
||||
new /obj/item/clothing/mask/gas(src)
|
||||
new /obj/item/device/flashlight(src)
|
||||
new /obj/item/weapon/tank/emergency_oxygen(src)
|
||||
new /obj/item/weapon/tank/oxygen/red(src)
|
||||
new /obj/item/weapon/extinguisher(src)
|
||||
new /obj/item/clothing/head/helmet/hardhat(src)
|
||||
new /obj/item/clothing/head/helmet/hardhat/red(src)
|
||||
|
||||
/obj/closet/firecloset/New()
|
||||
..()
|
||||
|
||||
new /obj/item/clothing/mask/gas(src)
|
||||
new /obj/item/weapon/tank/emergency_oxygen(src)
|
||||
new /obj/item/weapon/extinguisher(src)
|
||||
new /obj/item/clothing/suit/fire/firefighter(src)
|
||||
new /obj/item/clothing/mask/gas(src)
|
||||
new /obj/item/weapon/tank/oxygen/red(src)
|
||||
new /obj/item/weapon/extinguisher(src)
|
||||
new /obj/item/clothing/head/helmet/hardhat/red(src)
|
||||
|
||||
/*switch (pickweight(list("nothing" = 5, "bare-bones" = 35, "basic" = 40, "pickpocketed" = 10, "untouched" = 10)))
|
||||
if ("nothing")
|
||||
@@ -31,13 +32,13 @@
|
||||
new /obj/item/clothing/mask/breath(src)
|
||||
new /obj/item/weapon/tank/oxygen(src)
|
||||
new /obj/item/weapon/extinguisher(src)
|
||||
new /obj/item/clothing/head/helmet/hardhat(src)
|
||||
new /obj/item/clothing/head/helmet/hardhat/red(src)
|
||||
if ("untouched")
|
||||
new /obj/item/clothing/mask/breath(src)
|
||||
new /obj/item/weapon/tank/oxygen(src)
|
||||
new /obj/item/weapon/extinguisher(src)
|
||||
new /obj/item/clothing/suit/fire/firefighter(src)
|
||||
new /obj/item/clothing/head/helmet/hardhat(src)*/
|
||||
new /obj/item/clothing/head/helmet/hardhat/red(src)*/
|
||||
|
||||
/obj/closet/toolcloset/New()
|
||||
if(prob(60))
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
new /obj/item/clothing/suit/hazardvest( src )
|
||||
new /obj/item/clothing/mask/gas( src )
|
||||
new /obj/item/clothing/head/helmet/welding( src )
|
||||
new /obj/item/clothing/head/helmet/hardhat( src )
|
||||
new /obj/item/clothing/head/helmet/hardhat/white( src )
|
||||
new /obj/item/device/multitool( src )
|
||||
new /obj/item/device/flash( src )
|
||||
return
|
||||
|
||||
@@ -57,8 +57,6 @@
|
||||
src.sd_SetLuminosity(0)
|
||||
user.sd_SetLuminosity(user.luminosity + brightness_on)
|
||||
|
||||
|
||||
|
||||
/obj/item/device/flashlight/dropped(mob/user)
|
||||
if(on)
|
||||
user.sd_SetLuminosity(user.luminosity - brightness_on)
|
||||
@@ -66,8 +64,8 @@
|
||||
|
||||
/obj/item/clothing/head/helmet/hardhat/attack_self(mob/user)
|
||||
on = !on
|
||||
icon_state = "hardhat[on]"
|
||||
item_state = "hardhat[on]"
|
||||
icon_state = "hardhat[on]_[color]"
|
||||
item_state = "hardhat[on]_[color]"
|
||||
|
||||
if(on)
|
||||
user.sd_SetLuminosity(user.luminosity + brightness_on)
|
||||
|
||||
@@ -31,6 +31,7 @@
|
||||
//
|
||||
|
||||
/obj/item/proc/afterattack()
|
||||
|
||||
return
|
||||
|
||||
/obj/item/weapon/dummy/ex_act()
|
||||
|
||||
@@ -606,6 +606,41 @@
|
||||
</html>
|
||||
"}
|
||||
|
||||
/obj/item/weapon/book/manual/hydroponics_pod_people
|
||||
name = "The Human Harvest - From seed to market"
|
||||
icon_state ="bookHydroponicsPodPeople"
|
||||
author = "Farmer John"
|
||||
|
||||
dat = {"<html>
|
||||
<head>
|
||||
<style>
|
||||
h1 {font-size: 18px; margin: 15px 0px 5px;}
|
||||
h2 {font-size: 15px; margin: 15px 0px 5px;}
|
||||
li {margin: 2px 0px 2px 15px;}
|
||||
ul {list-style: none; margin: 5px; padding: 0px;}
|
||||
ol {margin: 5px; padding: 0px 15px;}
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<h3>Growing Humans</h3>
|
||||
|
||||
Why would you want to grow humans? Well I'm expecting most readers to be in the slave trade, but a few might actually
|
||||
want to revive fallen comrades. Growing pod people is easy, but prone to disaster.
|
||||
<p>
|
||||
<ol>
|
||||
<li>Find a dead person who is in need of cloning. </li>
|
||||
<li>Take a blood sample with a syringe. </li>
|
||||
<li>Inject a seed pack with the blood sample. </li>
|
||||
<li>Plant the seeds. </li>
|
||||
<li>Tend to the plants water and nutrition levels until it is time to harvest the cloned human.</li>
|
||||
</ol>
|
||||
<p>
|
||||
It really is that easy! Good luck!
|
||||
|
||||
</body>
|
||||
</html>
|
||||
"}
|
||||
|
||||
/obj/item/weapon/book/manual/medical_cloning
|
||||
name = "Cloning techniques of the 26th century"
|
||||
icon_state ="bookCloning"
|
||||
@@ -802,7 +837,7 @@
|
||||
"}
|
||||
|
||||
|
||||
/obj/item/weapon/book/manual/borg
|
||||
/obj/item/weapon/book/manual/robotics_cyborgs
|
||||
name = "Cyborgs for Dummies"
|
||||
icon_state = "borgbook"
|
||||
author = "XISC"
|
||||
|
||||
@@ -1,9 +1,3 @@
|
||||
/obj/item/weapon/storage/backpack/New()
|
||||
if (!istype(src, /obj/item/weapon/storage/backpack/holding))
|
||||
new /obj/item/weapon/storage/box( src )
|
||||
..()
|
||||
return
|
||||
|
||||
/obj/item/weapon/storage/backpack/MouseDrop(obj/over_object as obj)
|
||||
|
||||
// if (src.loc != usr)
|
||||
|
||||
@@ -200,13 +200,21 @@
|
||||
src.master.attackby(W, user)
|
||||
return
|
||||
|
||||
/obj/item/weapon/storage/box/New()
|
||||
|
||||
/obj/item/weapon/storage/survival_kit/New()
|
||||
sleep(1)
|
||||
new /obj/item/clothing/mask/breath( src )
|
||||
new /obj/item/weapon/tank/emergency_oxygen( src )
|
||||
..()
|
||||
return
|
||||
|
||||
/obj/item/weapon/storage/survival_kit/engineer/New()
|
||||
..()
|
||||
contents = list()
|
||||
sleep(1)
|
||||
new /obj/item/clothing/mask/breath( src )
|
||||
new /obj/item/weapon/tank/emergency_oxygen/engi( src )
|
||||
return
|
||||
|
||||
/obj/item/weapon/storage/dice/New()
|
||||
new /obj/item/weapon/dice( src )
|
||||
new /obj/item/weapon/dice/d20( src )
|
||||
|
||||
@@ -158,6 +158,7 @@ var/global/sent_strike_team = 0
|
||||
equip_if_possible(new /obj/item/clothing/glasses/thermal(src), slot_glasses)
|
||||
|
||||
equip_if_possible(new /obj/item/weapon/storage/backpack/security(src), slot_back)
|
||||
equip_if_possible(new /obj/item/weapon/storage/survival_kit(src), slot_in_backpack)
|
||||
|
||||
equip_if_possible(new /obj/item/ammo_magazine(src), slot_in_backpack)
|
||||
equip_if_possible(new /obj/item/weapon/storage/firstaid/regular(src), slot_in_backpack)
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 20 KiB After Width: | Height: | Size: 20 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 4.6 KiB After Width: | Height: | Size: 5.0 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 49 KiB After Width: | Height: | Size: 53 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 86 KiB After Width: | Height: | Size: 88 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 87 KiB After Width: | Height: | Size: 88 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 18 KiB After Width: | Height: | Size: 20 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 15 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 4.1 KiB After Width: | Height: | Size: 5.5 KiB |
@@ -1717,7 +1717,7 @@
|
||||
"aHa" = (/obj/disposalpipe/segment{dir = 4},/obj/machinery/door/airlock/maintenance{req_access_txt = "12"},/obj/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/turf/simulated/floor/plating,/area/library)
|
||||
"aHb" = (/obj/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/turf/simulated/wall,/area/library)
|
||||
"aHc" = (/obj/machinery/atmospherics/pipe/simple{color = "blue"; icon_state = "intact-b-f"; level = 1; name = "pipe"},/turf/simulated/wall,/area/hydroponics)
|
||||
"aHd" = (/obj/table,/obj/item/device/analyzer/plant_analyzer,/obj/item/weapon/paper/hydroponics,/turf/simulated/floor{icon_state = "hydrofloor"},/area/hydroponics)
|
||||
"aHd" = (/obj/table,/obj/item/weapon/paper/hydroponics,/obj/item/weapon/book/manual/hydroponics_pod_people,/obj/item/device/analyzer/plant_analyzer,/turf/simulated/floor{icon_state = "hydrofloor"},/area/hydroponics)
|
||||
"aHe" = (/turf/simulated/floor{icon_state = "hydrofloor"},/area/hydroponics)
|
||||
"aHf" = (/obj/machinery/light,/turf/simulated/floor{icon_state = "hydrofloor"},/area/hydroponics)
|
||||
"aHg" = (/obj/item/weapon/storage/toolbox/mechanical{pixel_x = -2; pixel_y = -1},/obj/disposalpipe/segment{dir = 1},/turf/simulated/floor{icon_state = "hydrofloor"},/area/hydroponics)
|
||||
@@ -2272,8 +2272,8 @@
|
||||
"aRJ" = (/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -29},/turf/simulated/wall,/area/storage/tools)
|
||||
"aRK" = (/obj/reagent_dispensers/watertank,/obj/machinery/camera{c_tag = "Engineering South-West"; dir = 1},/turf/simulated/floor,/area/storage/tools)
|
||||
"aRL" = (/obj/reagent_dispensers/fueltank,/turf/simulated/floor,/area/storage/tools)
|
||||
"aRM" = (/obj/table,/obj/item/weapon/storage/toolbox/electrical{pixel_x = 1; pixel_y = -1},/turf/simulated/floor,/area/storage/tools)
|
||||
"aRN" = (/obj/table,/obj/item/weapon/storage/toolbox/mechanical{pixel_x = -2; pixel_y = -1},/obj/item/weapon/storage/toolbox/mechanical{pixel_x = -2; pixel_y = -1},/obj/item/clothing/head/helmet/welding{pixel_x = -3; pixel_y = 5},/obj/machinery/firealarm{dir = 1; pixel_y = -24},/turf/simulated/floor,/area/storage/tools)
|
||||
"aRM" = (/obj/closet/toolcloset,/turf/simulated/floor,/area/storage/tools)
|
||||
"aRN" = (/obj/machinery/firealarm{dir = 1; pixel_y = -24},/obj/closet/toolcloset,/turf/simulated/floor,/area/storage/tools)
|
||||
"aRO" = (/obj/grille,/obj/window/reinforced,/obj/window/reinforced{dir = 4},/obj/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/storage/tools)
|
||||
"aRP" = (/obj/machinery/door/firedoor/border_only,/turf/simulated/floor{icon_state = "blue"; dir = 4},/area/hallway/primary/central)
|
||||
"aRQ" = (/obj/machinery/door/airlock/command{name = "Bridge"; req_access = null; req_access_txt = "19"},/obj/cable,/obj/cable{icon_state = "0-2"; d2 = 2},/obj/cable{icon_state = "0-4"; d2 = 4},/turf/simulated/floor,/area/bridge)
|
||||
@@ -2667,7 +2667,7 @@
|
||||
"aZo" = (/obj/machinery/vending/snack,/turf/simulated/floor,/area/crew_quarters/heads)
|
||||
"aZp" = (/obj/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/turf/simulated/floor,/area/crew_quarters/heads)
|
||||
"aZq" = (/obj/stool/chair{dir = 4},/turf/simulated/floor{icon_state = "blue"; dir = 4},/area/crew_quarters/heads)
|
||||
"aZr" = (/obj/machinery/camera{c_tag = "Heads of Staff"; dir = 8; network = "SS13"},/obj/table/reinforced,/obj/item/weapon/paper{info = "Due to financial reasons your department's funding will be reduced. Consequentially you will start receiving slightly less equipment in regular shipments. Try to use the equipment you have more responsibly so it will remain in working order for longer. Replacements might become hard to come by.<br><br>CentCom Financial Office"; name = "Budget Cuts"},/turf/simulated/floor,/area/crew_quarters/heads)
|
||||
"aZr" = (/obj/machinery/camera{c_tag = "Heads of Staff"; dir = 8; network = "SS13"},/obj/table/reinforced,/obj/item/weapon/paper{info = "Due to financial reasons your department's funding will be reduced. Consequentially you will start receiving slightly less equipment in regular shipments. Try to use the equipment you have more responsibly so it will remain in working order for longer. Replacements might become hard to come by.<br><br>CentCom Financial Office"; name = "Budget Cuts"},/obj/item/weapon/book/manual/hydroponics_pod_people,/turf/simulated/floor,/area/crew_quarters/heads)
|
||||
"aZs" = (/obj/grille,/obj/window/reinforced{dir = 4},/obj/window/reinforced{dir = 1},/obj/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/crew_quarters/heads)
|
||||
"aZt" = (/turf/simulated/floor{icon_state = "bot"},/area/hallway/primary/central)
|
||||
"aZu" = (/obj/machinery/navbeacon{codes_txt = "patrol;next_patrol=Med"; location = "HOP"},/turf/simulated/floor,/area/hallway/primary/central)
|
||||
@@ -4916,7 +4916,7 @@
|
||||
"bQB" = (/obj/crate,/turf/simulated/floor,/area/assembly/assembly_line)
|
||||
"bQC" = (/obj/disposalpipe/trunk{dir = 1},/obj/machinery/disposal,/turf/simulated/floor,/area/assembly/assembly_line)
|
||||
"bQD" = (/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 7},/obj/item/weapon/pen,/obj/table,/turf/simulated/floor,/area/assembly/assembly_line)
|
||||
"bQE" = (/obj/table,/obj/item/weapon/book/manual/borg{pixel_y = 5},/turf/simulated/floor,/area/assembly/assembly_line)
|
||||
"bQE" = (/obj/table,/obj/item/weapon/book/manual/robotics_cyborgs{pixel_y = 5},/turf/simulated/floor,/area/assembly/assembly_line)
|
||||
"bQF" = (/obj/machinery/computer/rdconsole{id = 2; name = "Robotics R&D Console"; req_access = null; req_access_txt = "29"},/turf/simulated/floor,/area/assembly/assembly_line)
|
||||
"bQG" = (/obj/item/device/prox_sensor{pixel_x = -8; pixel_y = 4},/obj/item/device/prox_sensor{pixel_x = -8; pixel_y = 4},/obj/item/device/flash,/obj/item/device/flash,/obj/table,/turf/simulated/floor,/area/assembly/assembly_line)
|
||||
"bQH" = (/obj/item/weapon/storage/toolbox/electrical{pixel_x = 1; pixel_y = -1},/obj/item/clothing/head/helmet/welding{pixel_x = -3; pixel_y = 5},/obj/table,/turf/simulated/floor,/area/assembly/assembly_line)
|
||||
@@ -4989,7 +4989,7 @@
|
||||
"bRW" = (/obj/machinery/atmospherics/pipe/simple{color = "blue"; icon_state = "intact-b-f"; level = 1; name = "pipe"},/turf/simulated/wall/r_wall,/area/crew_quarters/hor)
|
||||
"bRX" = (/obj/table,/obj/item/weapon/paper_bin{pixel_x = 1; pixel_y = 9},/obj/item/weapon/stamp/rd,/obj/item/device/radio/intercom{pixel_y = -30},/turf/simulated/floor{icon_state = "white"},/area/crew_quarters/hor)
|
||||
"bRY" = (/obj/table,/obj/item/weapon/circuitboard/aicore,/obj/item/device/taperecorder,/obj/item/device/paicard,/turf/simulated/floor{icon_state = "white"},/area/crew_quarters/hor)
|
||||
"bRZ" = (/obj/table,/obj/item/weapon/paper{info = "Due to financial reasons your department's funding will be reduced. Consequentially you will start receiving slightly less equipment in regular shipments. Try to use the equipment you have more responsibly so it will remain in working order for longer. Replacements might become hard to come by.<br><br>CentCom Financial Office"; name = "Budget Cuts"},/obj/item/weapon/book/manual/borg{pixel_y = 5},/obj/item/weapon/clipboard,/turf/simulated/floor{icon_state = "white"},/area/crew_quarters/hor)
|
||||
"bRZ" = (/obj/table,/obj/item/weapon/paper{info = "Due to financial reasons your department's funding will be reduced. Consequentially you will start receiving slightly less equipment in regular shipments. Try to use the equipment you have more responsibly so it will remain in working order for longer. Replacements might become hard to come by.<br><br>CentCom Financial Office"; name = "Budget Cuts"},/obj/item/weapon/book/manual/robotics_cyborgs{pixel_y = 5},/obj/item/weapon/clipboard,/turf/simulated/floor{icon_state = "white"},/area/crew_quarters/hor)
|
||||
"bSa" = (/obj/machinery/disposal,/obj/disposalpipe/trunk,/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/turf/simulated/floor{icon_state = "white"},/area/crew_quarters/hor)
|
||||
"bSb" = (/obj/machinery/light,/obj/cable,/obj/machinery/power/apc{name = "RD's Office APC"; pixel_y = -25},/turf/simulated/floor{icon_state = "white"},/area/crew_quarters/hor)
|
||||
"bSc" = (/obj/secure_closet/RD{pixel_x = 5},/turf/simulated/floor{icon_state = "white"},/area/crew_quarters/hor)
|
||||
@@ -5450,7 +5450,7 @@
|
||||
"caP" = (/obj/machinery/atmospherics/pipe/simple,/obj/machinery/atmospherics/pipe/simple{dir = 4},/turf/simulated/wall/r_wall,/area/engine/chiefs_office)
|
||||
"caQ" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; icon_state = "off"; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/table,/obj/item/weapon/cartridge/engineering{pixel_x = 4; pixel_y = 5},/obj/item/weapon/cartridge/engineering{pixel_x = -3; pixel_y = 2},/obj/item/weapon/cartridge/engineering{pixel_x = 3},/obj/item/stack/medical/bruise_pack{pixel_x = -3; pixel_y = 2},/turf/simulated/floor,/area/engine/chiefs_office)
|
||||
"caR" = (/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 7},/obj/item/weapon/pen,/obj/table/reinforced,/turf/simulated/floor,/area/engine/chiefs_office)
|
||||
"caS" = (/obj/machinery/camera{c_tag = "Engineering CE's Office"; dir = 1; pixel_x = 23},/obj/item/weapon/paper{info = "Due to financial reasons your department's funding will be reduced. Consequentially you will start receiving slightly less equipment in regular shipments. Try to use the equipment you have more responsibly so it will remain in working order for longer. Replacements might become hard to come by.<br><br>CentCom Financial Office"; name = "Budget Cuts"},/obj/table/reinforced,/obj/item/weapon/book/manual/borg{pixel_y = 5},/turf/simulated/floor,/area/engine/chiefs_office)
|
||||
"caS" = (/obj/machinery/camera{c_tag = "Engineering CE's Office"; dir = 1; pixel_x = 23},/obj/item/weapon/paper{info = "Due to financial reasons your department's funding will be reduced. Consequentially you will start receiving slightly less equipment in regular shipments. Try to use the equipment you have more responsibly so it will remain in working order for longer. Replacements might become hard to come by.<br><br>CentCom Financial Office"; name = "Budget Cuts"},/obj/table/reinforced,/obj/item/weapon/book/manual/robotics_cyborgs{pixel_y = 5},/turf/simulated/floor,/area/engine/chiefs_office)
|
||||
"caT" = (/obj/item/weapon/clipboard,/obj/item/weapon/stamp/ce,/obj/table/reinforced,/obj/item/clothing/glasses/meson,/turf/simulated/floor,/area/engine/chiefs_office)
|
||||
"caU" = (/obj/grille,/obj/window/reinforced{dir = 4},/obj/window/reinforced,/obj/window/reinforced{dir = 8},/obj/cable,/turf/simulated/floor/plating,/area/engine/chiefs_office)
|
||||
"caV" = (/turf/simulated/floor/engine{name = "n2 floor"; nitrogen = 100000; oxygen = 0},/area/atmos)
|
||||
|
||||
@@ -708,10 +708,8 @@
|
||||
#include "code\modules\mob\living\carbon\metroid\examine.dm"
|
||||
#include "code\modules\mob\living\carbon\metroid\hud.dm"
|
||||
#include "code\modules\mob\living\carbon\metroid\life.dm"
|
||||
#include "code\modules\mob\living\carbon\metroid\login.dm"
|
||||
#include "code\modules\mob\living\carbon\metroid\metroid.dm"
|
||||
#include "code\modules\mob\living\carbon\metroid\powers.dm"
|
||||
#include "code\modules\mob\living\carbon\metroid\say.dm"
|
||||
#include "code\modules\mob\living\carbon\monkey\death.dm"
|
||||
#include "code\modules\mob\living\carbon\monkey\emote.dm"
|
||||
#include "code\modules\mob\living\carbon\monkey\examine.dm"
|
||||
|
||||
Reference in New Issue
Block a user