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

Lawyer now has a purple suit and the job has two slots.

Browse Source 
Lowered the number of spare jumpsuits in most of the lockers from 6 to 3.
The old arrival message is now back in.
Finished the Ion Rifle and added one to the armory.  Might need to change it up a bit depending on how well it works.
Bullet_act worked on a bit, EMP effects should work now.
Cyborgs are stunned by EMPs.
Raised the changelings required genome number for multichan at the request of Urist. 


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2175 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
mport2004@gmail.com
2011-09-11 11:39:44 +00:00
parent 6575e3e251
commit e95d16da16
54 changed files with 8678 additions and 8665 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/defines/obj/closet.dm
+2
View File
@@ -10,6 +10,7 @@
var/welded = 0
var/wall_mounted = 0 //never solid (You can always pass over it)
flags = FPRINT
var/health = 200//Might be a bit much, dono can always change later
/obj/closet/acloset
desc = "It looks alien!"
@@ -597,6 +598,7 @@
var/icon_broken = "securebroken"
var/icon_off = "secureoff"
var/wall_mounted = 0 //never solid (You can always pass over it)
var/health = 300
/obj/secure_closet/courtroom
name = "Courtroom Locker"
code/defines/obj/clothing/jumpsuit.dm
-29
View File
@@ -102,8 +102,6 @@
// RANKS
/obj/item/clothing/under/rank
/obj/item/clothing/under/rank/atmospheric_technician
desc = "It has an Atmospherics rank stripe on it."
name = "Atmospherics Jumpsuit"
@@ -377,26 +375,6 @@
color = "detective"
armor = list(melee = 10, bullet = 5, laser = 5, taser = 5, bomb = 5, bio = 0, rad = 0)
/obj/item/clothing/under/lawyer
desc = "Slick threads."
name = "Lawyer suit"
flags = FPRINT | TABLEPASS
/obj/item/clothing/under/lawyer/black
icon_state = "lawyer_black"
item_state = "lawyer_black"
color = "lawyer_black"
/obj/item/clothing/under/lawyer/red
icon_state = "lawyer_red"
item_state = "lawyer_red"
color = "lawyer_red"
/obj/item/clothing/under/lawyer/blue
icon_state = "lawyer_blue"
item_state = "lawyer_blue"
color = "lawyer_blue"
/obj/item/clothing/under/scratch
name = "White Suit"
desc = "A white suit, suitable for an excellent host"
@@ -496,13 +474,6 @@
flags = FPRINT | TABLEPASS | SUITSPACE
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
/obj/item/clothing/under/bluesuit
name = "Blue Suit"
icon_state = "bluesuit"
item_state = "bluesuit"
color = "bluesuit"
desc = "A classy suit and tie"
/obj/item/clothing/under/spiderman
name = "Deadpool Suit"
desc = "A suit of Deadpool!"
code/defines/obj/clothing/suit.dm
+1 -18
View File
@@ -6,7 +6,7 @@
var/fire_resist = T0C+100
flags = FPRINT | TABLEPASS
var/list/allowed = list(/obj/item/weapon/tank/emergency_oxygen)
armor = list(melee = 0, bullet = 0, laser = 2, taser = 2, bomb = 0, bio = 0, rad = 0)
armor = list(melee = 0, bullet = 0, laser = 0, taser = 2, bomb = 0, bio = 0, rad = 0)
/obj/item/clothing/suit/bomb_suit
name = "bomb suit"
@@ -86,15 +86,6 @@
allowed = list(/obj/item/weapon/gun/projectile/detective,/obj/item/weapon/gun/projectile,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/cigpacket,/obj/item/weapon/zippo,/obj/item/device/detective_scanner,/obj/item/device/taperecorder)
armor = list(melee = 75, bullet = 25, laser = 50, taser = 10, bomb = 25, bio = 10, rad = 0)
/obj/item/clothing/suit/judgerobe
name = "judge's robe"
desc = "This robe commands authority."
icon_state = "judge"
item_state = "judge"
flags = FPRINT | TABLEPASS | ONESIZEFITSALL
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
allowed = list(/obj/item/weapon/cigpacket,/obj/item/weapon/spacecash)
/obj/item/clothing/suit/labcoat
name = "labcoat"
desc = "A suit that protects against minor chemical spills."
@@ -480,14 +471,6 @@
item_state = "imperium_monk"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
/obj/item/clothing/suit/suit
name = "Blue Suit Jacket"
desc = "A snappy dress jacket."
icon_state = "suitjacket_blue_open"
item_state = "suitjacket_blue_open"
body_parts_covered = UPPER_TORSO|ARMS
armor = list(melee = 5, bullet = 2, laser = 2, taser = 2, bomb = 0, bio = 0, rad = 0)
/obj/item/clothing/suit/chickensuit
name = "Chicken Suit"
desc = "A suit made long ago by the ancient empire KFC."