cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-31 07:57:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

- yellow, blue, orange and red hardhats added

Browse Source 
- 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
Download Patch File Download Diff File Expand all files Collapse all files
code/game/algorithm.dm
+1 -1
View File
@@ -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)
code/game/gamemodes/wizard/wizard.dm
+2 -1
View File
@@ -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)
code/game/jobs/jobprocs.dm
+23 -2
View File
@@ -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)
/*
code/game/magic/library.dm
+1
View File
@@ -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"
code/game/objects/closets/firecloset.dm
+8 -7
View File
@@ -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))
code/game/objects/closets/secure/engineering.dm
+1 -1
View File
@@ -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
code/game/objects/devices/flashlight.dm
+2 -4
View File
@@ -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)
code/game/objects/items/item.dm
+1
View File
@@ -31,6 +31,7 @@
//
/obj/item/proc/afterattack()
return
/obj/item/weapon/dummy/ex_act()
code/game/objects/items/weapons/manuals.dm
+36 -1
View File
@@ -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"
code/game/objects/storage/backpack.dm
-6
View File
@@ -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)
code/game/objects/storage/storage.dm
+10 -2
View File
@@ -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 )