cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-28 14:37:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

1)The RIG helmet is useful now to protect against radiation!

Browse Source 
2)Armor Can hold revolvers, and so can the detective's coat.
3)Chef's apron is going live, it can carry a knife, and has a slight heat resistance (only slight don't run into a fire).
4)The Detective and Chief engineer smoked all buy one of their cigars on their way to the station. But I doubt they will give pause before smoking the last ones.
5)Suit storage is now used when you spawn! Pen lights in pocket, and guns in armor. And.. plant analyzers in aprons.
6) The ninja mask now resists radiaion. Meaning I buffed a gimmik item set for an unstopable killer to resist all radiaion. Don't mess with that ninja.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1263 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
tronaldnwn@hotmail.com
2011-03-24 10:27:07 +00:00
parent 7e9b7f5c53
commit d3343df996
5 changed files with 25 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/defines/obj/clothing/head.dm
+1
View File
@@ -140,6 +140,7 @@
name = "rig helmet"
icon_state = "rig"
item_state = "rig_helm"
radiation_protection = 0.15
/obj/item/clothing/head/helmet/space/syndicate
name = "red space helmet"
code/defines/obj/clothing/mask.dm
+1
View File
@@ -41,6 +41,7 @@
icon_state = "s-ninja"
item_state = "s-ninja_mask"
vchange = 1
radiation_protection = 0.35
/obj/item/clothing/mask/gas/voice
name = "gas mask"
code/defines/obj/clothing/suit.dm
+7 -3
View File
@@ -63,7 +63,7 @@
icon_state = "detective"
item_state = "det_suit"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
allowed = list(/obj/item/weapon/gun/detectiverevolver,/obj/item/weapon/ammo/a38,/obj/item/weapon/cigpacket,/obj/item/weapon/zippo,/obj/item/device/detective_scanner,/obj/item/device/taperecorder)
allowed = list(/obj/item/weapon/gun/detectiverevolver,/obj/item/weapon/gun/revolver,/obj/item/weapon/ammo/a38,/obj/item/weapon/cigpacket,/obj/item/weapon/zippo,/obj/item/device/detective_scanner,/obj/item/device/taperecorder)
/obj/item/clothing/suit/judgerobe
name = "judge's robe"
@@ -116,12 +116,16 @@
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
allowed = list (/obj/item/weapon/plantbgone,/obj/item/device/analyzer/plant_analyzer,/obj/item/seeds,/obj/item/nutrient,/obj/item/weapon/minihoe)
/obj/item/clothing/suit/apron
/obj/item/clothing/suit/chef
name = "Chef's apron"
icon_state = "chef"
item_state = "chef"
gas_transfer_coefficient = 0.90
permeability_coefficient = 0.90
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
allowed = list (/obj/item/weapon/kitchenknife)
protective_temperature = 1000 //If you can't stand the heat, get back to the kitchen - Micro
heat_transfer_coefficient = 0.75
/obj/item/clothing/suit/wizrobe
name = "wizard robe"
@@ -155,7 +159,7 @@
// ARMOR
/obj/item/clothing/suit/armor
allowed = list(/obj/item/weapon/gun/energy,/obj/item/weapon/baton,/obj/item/weapon/handcuffs)
allowed = list(/obj/item/weapon/gun/energy,/obj/item/weapon/gun/revolver,/obj/item/weapon/baton,/obj/item/weapon/handcuffs)
/obj/item/clothing/suit/armor/vest
name = "armor"
code/game/jobs/jobprocs.dm
+16 -11
View File
@@ -312,10 +312,11 @@
if ("Geneticist")
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/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)
src.equip_if_possible(new /obj/item/device/flashlight/pen(src), slot_r_store)
src.equip_if_possible(new /obj/item/device/flashlight/pen(src), slot_s_store)
if ("Chemist")
src.equip_if_possible(new /obj/item/device/radio/headset/headset_med (src), slot_ears) // -- TLE
@@ -383,6 +384,7 @@
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)
src.equip_if_possible(new /obj/item/clothing/head/det_hat(src), slot_head)
src.equip_if_possible(new /obj/item/clothing/mask/cigarette/cigar(src), slot_wear_mask) // Smoked the rest coming to station lol - Micro
src.equip_if_possible(new /obj/item/clothing/gloves/black(src), slot_gloves)
src.equip_if_possible(new /obj/item/weapon/storage/fcard_kit(src), slot_in_backpack)
src.equip_if_possible(new /obj/item/weapon/fcardholder(src), slot_in_backpack)
@@ -399,7 +401,7 @@
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)
src.equip_if_possible(new /obj/item/weapon/storage/firstaid/regular(src), slot_l_hand)
src.equip_if_possible(new /obj/item/device/flashlight/pen(src), slot_r_store)
src.equip_if_possible(new /obj/item/device/flashlight/pen(src), slot_s_store)
if ("Captain")
src.equip_if_possible(new /obj/item/device/radio/headset/heads/captain (src), slot_ears)
@@ -426,7 +428,7 @@
// src.equip_if_possible(new /obj/item/clothing/glasses/sunglasses(src), slot_glasses)
// src.equip_if_possible(new /obj/item/weapon/gun/taser_gun(src), slot_in_backpack)
src.equip_if_possible(new /obj/item/weapon/handcuffs(src), slot_in_backpack)
src.equip_if_possible(new /obj/item/weapon/handcuffs(src), slot_l_store)
src.equip_if_possible(new /obj/item/weapon/handcuffs(src), slot_s_store)
if ("Warden")
src.equip_if_possible(new /obj/item/device/radio/headset/headset_sec (src), slot_ears) // -- TLE
@@ -439,7 +441,7 @@
src.equip_if_possible(new /obj/item/clothing/gloves/black(src), slot_gloves)
src.equip_if_possible(new /obj/item/clothing/glasses/sunglasses(src), slot_glasses)
src.equip_if_possible(new /obj/item/clothing/mask/gas/emergency(src), slot_wear_mask)
src.equip_if_possible(new /obj/item/weapon/gun/energy/taser_gun(src), slot_in_backpack)
src.equip_if_possible(new /obj/item/weapon/gun/energy/taser_gun(src), slot_s_store)
src.equip_if_possible(new /obj/item/weapon/handcuffs(src), slot_in_backpack)
// src.equip_if_possible(new /obj/item/weapon/storage/flashbang_kit(src), slot_in_backpack)
src.equip_if_possible(new /obj/item/device/flash(src), slot_l_store)
@@ -464,7 +466,7 @@
src.equip_if_possible(new /obj/item/weapon/storage/backpack/security (src), slot_back)
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/general(src), slot_in_backpack)
src.equip_if_possible(new /obj/item/weapon/gun/energy/general(src), slot_s_store)
src.equip_if_possible(new /obj/item/device/flash(src), slot_l_store)
@@ -500,6 +502,7 @@
if ("Chef")
src.equip_if_possible(new /obj/item/clothing/under/rank/chef(src), slot_w_uniform)
src.equip_if_possible(new /obj/item/clothing/suit/chef(src), slot_wear_suit)
src.equip_if_possible(new /obj/item/clothing/shoes/black(src), slot_shoes)
src.equip_if_possible(new /obj/item/clothing/head/chefhat(src), slot_head)
// src.equip_if_possible(new /obj/item/weapon/kitchen/rollingpin(src), slot_in_backpack) // it's in his office
@@ -514,12 +517,12 @@
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)
if ("Botanist")
if ("Botanist") //slot_s_store will free the hands of the working class
src.equip_if_possible(new /obj/item/clothing/under/rank/hydroponics(src), slot_w_uniform)
src.equip_if_possible(new /obj/item/clothing/shoes/black(src), slot_shoes)
src.equip_if_possible(new /obj/item/clothing/gloves/botanic_leather(src), slot_gloves)
src.equip_if_possible(new /obj/item/device/analyzer/plant_analyzer(src), slot_l_hand)
src.equip_if_possible(new /obj/item/clothing/suit/apron(src), slot_wear_suit)
src.equip_if_possible(new /obj/item/device/analyzer/plant_analyzer(src), slot_s_store)
if ("Librarian")
@@ -562,7 +565,8 @@
src.equip_if_possible(new /obj/item/device/pda/heads(src), slot_belt)
src.equip_if_possible(new /obj/item/clothing/gloves/yellow(src), slot_gloves)
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(src), slot_head) // It felt right. - Micro
src.equip_if_possible(new /obj/item/clothing/mask/cigarette/cigar(src), slot_wear_mask)
src.equip_if_possible(new /obj/item/clothing/glasses/meson(src), slot_glasses)
src.equip_if_possible(new /obj/item/clothing/under/rank/chief_engineer(src), slot_w_uniform)
@@ -574,7 +578,7 @@
src.equip_if_possible(new /obj/item/clothing/suit/labcoat(src), slot_wear_suit)
src.equip_if_possible(new /obj/item/weapon/pen(src), slot_l_hand)
src.equip_if_possible(new /obj/item/weapon/clipboard(src), slot_r_hand)
src.equip_if_possible(new /obj/item/device/flashlight/pen(src), slot_r_store)
src.equip_if_possible(new /obj/item/device/flashlight/pen(src), slot_s_store)
if ("Chief Medical Officer")
src.equip_if_possible(new /obj/item/device/radio/headset/heads/cmo (src), slot_ears)
@@ -584,16 +588,17 @@
src.equip_if_possible(new /obj/item/clothing/under/rank/medical(src), slot_w_uniform)
src.equip_if_possible(new /obj/item/clothing/suit/labcoat/cmo(src), slot_wear_suit)
src.equip_if_possible(new /obj/item/weapon/storage/firstaid/regular(src), slot_l_hand)
src.equip_if_possible(new /obj/item/device/flashlight/pen(src), slot_r_store)
src.equip_if_possible(new /obj/item/device/flashlight/pen(src), slot_s_store)
if ("Virologist")
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/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)
src.equip_if_possible(new /obj/item/clothing/suit/labcoat(src), slot_wear_suit)
src.equip_if_possible(new /obj/item/device/flashlight/pen(src), slot_r_store)
src.equip_if_possible(new /obj/item/device/flashlight/pen(src), slot_s_store)
if ("Cyborg")
// Robotize()
tgstation.dme
-4
View File
@@ -139,7 +139,6 @@
#define DEBUG
// END_PREFERENCES
// BEGIN_INCLUDE
#include "code\names.dm"
#include "code\setup.dm"
#include "code\stylesheet.dm"
#include "code\ATMOSPHERICS\atmospherics.dm"
@@ -619,8 +618,6 @@
#include "code\modules\mob\login.dm"
#include "code\modules\mob\logout.dm"
#include "code\modules\mob\mob.dm"
#include "code\modules\mob\organs.dm"
#include "code\modules\mob\say.dm"
#include "code\modules\mob\transform_procs.dm"
#include "code\modules\mob\dead\observer\hud.dm"
#include "code\modules\mob\dead\observer\login.dm"
@@ -757,7 +754,6 @@
#include "code\WorkInProgress\cloning.dm"
#include "code\WorkInProgress\explosion_particles.dm"
#include "code\WorkInProgress\KeelinsStuff.dm"
#include "code\WorkInProgress\message_server.dm"
#include "code\WorkInProgress\mining.dm"
#include "code\WorkInProgress\NewBan.dm"
#include "code\WorkInProgress\recycling\conveyor.dm"