RD now has a personal locker.

CMO now has a personal locker.
CE gets a pair of mag boots in his locker. Previously commented out.
Added department head sets to head lockers.
Fixed MULE dropoff at Security and Kitchen.
Syndicate space suits now slow you down by a small amount.
New prize at the arcade.
Added back Robocop selection for Security borgs.
More CentCom area adjustments.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@556 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
noisomehollow@lycos.com
2010-12-07 01:08:36 +00:00
parent 1bc1154702
commit 86760c3841
13 changed files with 10204 additions and 10133 deletions
@@ -171,6 +171,11 @@
icon_state = "purple"
requires_power = 0
/area/centcom/creed
name = "Creed's Office"
icon_state = "purple"
requires_power = 0
//EXTRA
/area/asteroid // -- TLE
+20
View File
@@ -281,6 +281,26 @@
icon_off = "medical1"
req_access = list(access_medical)
/obj/secure_closet/RD
name = "Research Director"
icon_state = "medical1"
icon_closed = "medical"
icon_locked = "medical1"
icon_opened = "medicalopen"
icon_broken = "medicalbroken"
icon_off = "medical1"
req_access = list(access_rd)
/obj/secure_closet/CMO
name = "Chief Medical Officer"
icon_state = "medical1"
icon_closed = "medical"
icon_locked = "medical1"
icon_opened = "medicalopen"
icon_broken = "medicalbroken"
icon_off = "medical1"
req_access = list(access_cmo)
/obj/secure_closet/personal
desc = "The first card swiped gains control."
name = "Personal Closet"
+1 -1
View File
@@ -983,7 +983,7 @@
/obj/item/clothing/under/syndicate/tacticool
name = "Tacticool Turtleneck"
desc = "Non-descript, slightly suspicious civilian clothing. Wearing this makes you feel like buying an SKS, going into the woods, and operating."
desc = "Wearing this makes you feel like buying an SKS, going into the woods, and operating."
icon_state = "syndicate"
item_state = "bl_suit"
color = "syndicate"
+4 -5
View File
@@ -133,7 +133,7 @@
src.gameover = 1
src.temp = "[src.enemy_name] has fallen! Rejoice!"
var/obj/item/prize
var/prizeselect = pick(1,2,4,5,6)
var/prizeselect = pick(1,2,3,4,5,6)
switch(prizeselect)
if(1)
prize = new /obj/item/weapon/spacecash(src.loc)
@@ -141,10 +141,8 @@
prize.desc = "It's almost like actual currency!"
if(2)
prize = new /obj/item/toy/blink(src.loc)
// if(3)
// prize = new /obj/item/weapon/zippo(src.loc)
// prize.name = "Burno Lighter"
// prize.desc = "Almost like a decent lighter!"
if(3)
prize = new /obj/item/clothing/under/syndicate/tacticool(src.loc)
if(4)
prize = new /obj/item/toy/sword(src.loc)
if(5)
@@ -153,6 +151,7 @@
if(6)
prize = new /obj/item/toy/crossbow(src.loc)
else if ((src.enemy_mp <= 5) && (prob(70)))
var/stealamt = rand(2,3)
src.temp = "[src.enemy_name] steals [stealamt] of your power!"
@@ -2,6 +2,7 @@
..()
sleep(2)
new /obj/item/weapon/reagent_containers/food/drinks/flask(src)
new /obj/item/device/radio/headset/headset_com( src )
new /obj/item/weapon/gun/energy/general( src )
new /obj/item/weapon/storage/id_kit( src )
new /obj/item/clothing/under/rank/captain( src )
@@ -2,10 +2,11 @@
..()
sleep(2)
new /obj/item/weapon/storage/toolbox/mechanical( src )
new /obj/item/device/radio/headset/headset_eng( src )
new /obj/item/clothing/under/rank/chief_engineer( src )
new /obj/item/clothing/gloves/yellow( src )
new /obj/item/clothing/shoes/brown( src )
// new /obj/item/clothing/shoes/magnetic( src )
new /obj/item/clothing/shoes/magboots( src )
new /obj/item/clothing/ears/earmuffs( src )
new /obj/item/clothing/glasses/meson( src )
new /obj/item/clothing/suit/fire( src )
@@ -31,3 +31,18 @@
new /obj/item/clothing/mask/medical( src )
new /obj/item/clothing/mask/medical( src )
return
/obj/secure_closet/CMO/New()
..()
sleep(2)
new /obj/item/device/radio/headset/headset_med( src )
new /obj/item/clothing/suit/labcoat/cmo( src )
new /obj/item/clothing/under/rank/medical( src )
new /obj/item/weapon/tank/air( src )
new /obj/item/clothing/mask/gas( src )
new /obj/item/clothing/suit/bio_suit( src )
new /obj/item/clothing/shoes/white( src )
new /obj/item/clothing/gloves/latex( src )
new /obj/item/clothing/head/bio_hood( src )
new /obj/item/clothing/suit/labcoat(src)
return
@@ -10,3 +10,17 @@
new /obj/item/clothing/head/bio_hood( src )
new /obj/item/clothing/suit/labcoat(src)
return
/obj/secure_closet/RD/New()
..()
sleep(2)
new /obj/item/device/radio/headset/headset_com( src )
new /obj/item/clothing/under/rank/research_director( src )
new /obj/item/weapon/tank/air( src )
new /obj/item/clothing/mask/gas( src )
new /obj/item/clothing/suit/bio_suit( src )
new /obj/item/clothing/shoes/white( src )
new /obj/item/clothing/gloves/latex( src )
new /obj/item/clothing/head/bio_hood( src )
new /obj/item/clothing/suit/labcoat(src)
return
+2 -1
View File
@@ -44,7 +44,7 @@
/obj/secure_closet/highsec/New()
..()
sleep(2)
// new /obj/item/weapon/shield/riot(src)
new /obj/item/device/radio/headset/headset_com(src)
new /obj/item/weapon/gun/energy/general( src )
new /obj/item/device/flash( src )
new /obj/item/weapon/storage/id_kit( src )
@@ -58,6 +58,7 @@
/obj/secure_closet/hos/New()
..()
sleep(2)
new /obj/item/device/radio/headset/headset_sec(src)
new /obj/item/weapon/shield/riot(src)
new /obj/item/weapon/gun/energy/general( src )
new /obj/item/device/flash( src )
@@ -141,6 +141,9 @@
if(/obj/item/clothing/suit/space/rig)
if(!istype(src.loc, /turf/space)) // space suits slow you down a bit unless in space
tally += 2
if(/obj/item/clothing/suit/space/syndicate)
if(!istype(src.loc, /turf/space)) // space suits slow you down a bit unless in space
tally += 1
if (istype(src.shoes, /obj/item/clothing/shoes))
if (src.shoes.chained)
@@ -57,9 +57,13 @@
if("Security")
src.module = new /obj/item/weapon/robot_module/security(src)
src.hands.icon_state = "security"
var/icontype = input("Select an icon!", "Robot", null, null) in list("Standard", "Armored")
var/icontype = input("Select an icon!", "Robot", null, null) in list("Standard", "Armored", "Robocop", "Robocop Red")
if(icontype == "Armored")
src.icon_state = "Security"
else if(icontype == "Robocop")
src.icon_state = "Security2"
else if(icontype == "Robocop Red")
src.icon_state = "Security3"
else
src.icon_state = "robot"
src.modtype = "Sec"
+3666 -3663
View File
File diff suppressed because it is too large Load Diff
+6466 -6461
View File
File diff suppressed because it is too large Load Diff