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

Merged some revisions from the branch with the trunk.

Browse Source 
List of changes:
E-Guns are now back in the armory.
Shotgun is now back in the bar.
Medical and Security HUDs can now be constructed via R&D.
Fixed the spelling in the Autolathe board on the R&D console. It used to say "Atuolathe".
Added the colourful syndicate suits into the game.
Added the colourful syndicate helmets into the game.
Added Detective's armor using the detective's armor sprite.
All tables on the map are replaced with the default instances since we have smooth tables.
Medical Anesthetic closets now spawn with medical masks instead of breath masks.
Detective's armor spawns in forensics lockers.
Finally finished the cyborg manual from a while back.
Many useless aesthetic wires removed to help reduce lag.
Two sleepers located in medbay lobby.
EVA racks now spawn with breath masks instead of medical masks.
Engineering RIG racks now spawn with breath masks instead of medical masks.
Three copies of the Cyborg Manual are located on the map. One in the RD's office, one in robotics
and one in the CE's office.
The Atmospherics mix tank now starts with no air inside. So that now you no longer have to drain the
air before mixing gases.
Added in some icons for new possible chemist, virologist, geneticist and scientist jumpsuits.
Coded in those jumpsuits, they aren't used anywhere yet though.
Added in a new lawyer's suit.
Added in a new suit jacket for the lawyer. Can be buttoned up or unbuttoned using the command under
the "objects" tab.
Added in a sprite for a Riot Helmet.
Coded in a riot helmet and riot suit. Not used anywhere though.
Lawyer now spawns wearing his new suit and suit jacket.
Orange prisoner jumpsuit now has suit sensors forced fully on.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1711 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
Superxpdude@gmail.com
2011-06-23 17:19:19 +00:00
parent 7107193778
commit fed2ddeb54
17 changed files with 9123 additions and 8852 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/defines/obj/clothing/head.dm
+63
View File
@@ -181,6 +181,61 @@
desc = "Has a tag: Totally not property of an enemy corporation, honest."
armor = list(melee = 60, bullet = 50, laser = 30, taser = 15, bomb = 30, bio = 30, rad = 30)
/obj/item/clothing/head/helmet/space/syndicate/green
name = "Green Space Helmet"
icon_state = "syndicate-helm-green"
item_state = "syndicate-helm-green"
/obj/item/clothing/head/helmet/space/syndicate/green/dark
name = "Dark Green Space Helmet"
icon_state = "syndicate-helm-green-dark"
item_state = "syndicate-helm-green-dark"
/obj/item/clothing/head/helmet/space/syndicate/orange
name = "Orange Space Helmet"
icon_state = "syndicate-helm-orange"
item_state = "syndicate-helm-orange"
/obj/item/clothing/head/helmet/space/syndicate/blue
name = "Blue Space Helmet"
icon_state = "syndicate-helm-blue"
item_state = "syndicate-helm-blue"
/obj/item/clothing/head/helmet/space/syndicate/black
name = "Black Space Helmet"
icon_state = "syndicate-helm-black"
item_state = "syndicate-helm-black"
/obj/item/clothing/head/helmet/space/syndicate/black/green
name = "Black Space Helmet"
icon_state = "syndicate-helm-black-green"
item_state = "syndicate-helm-black-green"
/obj/item/clothing/head/helmet/space/syndicate/black/blue
name = "Black Space Helmet"
icon_state = "syndicate-helm-black-blue"
item_state = "syndicate-helm-black-blue"
/obj/item/clothing/head/helmet/space/syndicate/black/med
name = "Black Space Helmet"
icon_state = "syndicate-helm-black-med"
item_state = "syndicate-helm-black"
/obj/item/clothing/head/helmet/space/syndicate/black/orange
name = "Black Space Helmet"
icon_state = "syndicate-helm-black-orange"
item_state = "syndicate-helm-black"
/obj/item/clothing/head/helmet/space/syndicate/black/red
name = "Black Space Helmet"
icon_state = "syndicate-helm-black-red"
item_state = "syndicate-helm-black-red"
/obj/item/clothing/head/helmet/space/syndicate/black/engie
name = "Black Space Helmet"
icon_state = "syndicate-helm-black-engie"
item_state = "syndicate-helm-black"
/obj/item/clothing/head/syndicatefake
name = "red space helmet replica"
icon_state = "syndicate"
@@ -256,6 +311,14 @@
flags = FPRINT|TABLEPASS|HEADSPACE
armor = list(melee = 0, bullet = 0, laser = 2, taser = 2, bomb = 0, bio = 0, rad = 0)
/obj/item/clothing/head/helmet/riot
name = "Riot Helmet"
desc = "A helmet specifically designed to protect against close range attacks."
icon_state = "riot"
item_state = "helmet"
flags = FPRINT|TABLEPASS|SUITSPACE|HEADCOVERSEYES
armor = list(melee = 85, bullet = 10, laser = 5, taser = 5, bomb = 5, bio = 2, rad = 0)
code/defines/obj/clothing/jumpsuit.dm
+40
View File
@@ -64,9 +64,12 @@
/obj/item/clothing/under/color/orange
name = "Orange Jumpsuit"
desc = "Standard Nanotrasen prisoner wear. It's suit sensors are stuck in the Fully On position."
icon_state = "orange"
item_state = "o_suit"
color = "orange"
has_sensor = 2
sensor_mode = 3
/obj/item/clothing/under/color/pink
name = "Pink Jumpsuit"
@@ -292,6 +295,43 @@
icon_state = "chef"
color = "chef"
/obj/item/clothing/under/rank/geneticist_new
desc = "Made of a special fiber that gives special protection against biohazards."
name = "Genetics Jumpsuit"
icon_state = "genetics_new"
item_state = "w_suit"
color = "geneticsblue"
permeability_coefficient = 0.50
armor = list(melee = 0, bullet = 0, laser = 2, taser = 2, bomb = 0, bio = 10, rad = 0)
/obj/item/clothing/under/rank/chemist_new
desc = "Made of a special fiber that gives special protection against biohazards."
name = "Chemist Jumpsuit"
icon_state = "chemist_new"
item_state = "w_suit"
color = "chemistorange"
permeability_coefficient = 0.50
armor = list(melee = 0, bullet = 0, laser = 2, taser = 2, bomb = 0, bio = 10, rad = 0)
/obj/item/clothing/under/rank/scientist_new
desc = "Made of a special fiber that gives special protection against biohazards and small explosions."
name = "Scientist Jumpsuit"
icon_state = "scientist_new"
item_state = "w_suit"
color = "sciencepurple"
permeability_coefficient = 0.50
armor = list(melee = 0, bullet = 0, laser = 2, taser = 2, bomb = 10, bio = 10, rad = 0)
/obj/item/clothing/under/rank/virologist_new
desc = "Made of a special fiber that gives increased protection against biohazards."
name = "Virologist Jumpsuit"
icon_state = "virologist_new"
item_state = "w_suit"
color = "medical"
permeability_coefficient = 0.50
armor = list(melee = 0, bullet = 0, laser = 2, taser = 2, bomb = 0, bio = 15, rad = 0)
// OTHER NONRANKED STATION JOBS
/obj/item/clothing/under/det
name = "Hard worn suit"
code/defines/obj/clothing/suit.dm
+81
View File
@@ -74,6 +74,15 @@
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 = 50, bullet = 40, laser = 30, taser = 10, bomb = 20, bio = 0, rad = 0)
/obj/item/clothing/suit/det_suit/armor
name = "armor"
desc = "An armored vest with a detective's badge on it."
icon_state = "detective-armor"
item_state = "armor"
body_parts_covered = UPPER_TORSO|LOWER_TORSO
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 = 50, laser = 50, taser = 10, bomb = 25, bio = 10, rad = 0)
/obj/item/clothing/suit/judgerobe
name = "judge's robe"
desc = "This robe commands authority."
@@ -287,6 +296,15 @@
slowdown = 1
armor = list(melee = 80, bullet = 60, laser = 50, taser = 25, bomb = 50, bio = 10, rad = 0)
/obj/item/clothing/suit/armor/riot
name = "Riot Suit"
desc = "A suit of armor with heavy padding to protect against melee attacks. Looks like it might impair movement."
icon_state = "swat"
item_state = "swat"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
slowdown = 2.5
armor = list(melee = 85, bullet = 5, laser = 2, taser = 2, bomb = 5, bio = 0, rad = 0)
// FIRE SUITS
/obj/item/clothing/suit/fire
@@ -371,6 +389,61 @@
slowdown = 1
armor = list(melee = 60, bullet = 50, laser = 30, taser = 15, bomb = 30, bio = 30, rad = 30)
/obj/item/clothing/suit/space/syndicate/green
name = "Green Space Suit"
icon_state = "syndicate-green"
item_state = "syndicate-green"
/obj/item/clothing/suit/space/syndicate/green/dark
name = "Dark Green Space Suit"
icon_state = "syndicate-green-dark"
item_state = "syndicate-green-dark"
/obj/item/clothing/suit/space/syndicate/orange
name = "Orange Space Suit"
icon_state = "syndicate-orange"
item_state = "syndicate-orange"
/obj/item/clothing/suit/space/syndicate/blue
name = "Blue Space Suit"
icon_state = "syndicate-blue"
item_state = "syndicate-blue"
/obj/item/clothing/suit/space/syndicate/black
name = "Black Space Suit"
icon_state = "syndicate-black"
item_state = "syndicate-black"
/obj/item/clothing/suit/space/syndicate/black/green
name = "Black and Green Space Suit"
icon_state = "syndicate-black-green"
item_state = "syndicate-black-green"
/obj/item/clothing/suit/space/syndicate/black/blue
name = "Black and Blue Space Suit"
icon_state = "syndicate-black-blue"
item_state = "syndicate-black-blue"
/obj/item/clothing/suit/space/syndicate/black/med
name = "Green Space Suit"
icon_state = "syndicate-black-med"
item_state = "syndicate-black"
/obj/item/clothing/suit/space/syndicate/black/orange
name = "Black and Orange Space Suit"
icon_state = "syndicate-black-orange"
item_state = "syndicate-black"
/obj/item/clothing/suit/space/syndicate/black/red
name = "Black and Red Space Suit"
icon_state = "syndicate-black-red"
item_state = "syndicate-black-red"
/obj/item/clothing/suit/space/syndicate/black/engie
name = "Black Engineering Space Suit"
icon_state = "syndicate-black-engie"
item_state = "syndicate-black"
/obj/item/clothing/suit/syndicatefake
name = "red space suit replica"
icon_state = "syndicate"
@@ -479,3 +552,11 @@
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)