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

The crew monitoring computer should work better now

Browse Source 
North solars expanded slightly
Cargo can now order engine parts
Power computer wont update every second so you can actually use the thing now
Rotate verb for the emitters and Particle Accelerator
Solar tracker does not use "in world" anymore

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1013 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
mport2004@gmail.com
2011-02-10 11:20:52 +00:00
parent 71d5a5f28c
commit 54b1d50b25
21 changed files with 8694 additions and 8554 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/closets/gmcloset.dm
+2 -2
View File
@@ -5,8 +5,8 @@
new /obj/item/clothing/head/that(src)
new /obj/item/clothing/under/sl_suit(src)
new /obj/item/clothing/under/sl_suit(src)
new /obj/item/clothing/under/bartender(src)
new /obj/item/clothing/under/bartender(src)
new /obj/item/clothing/under/rank/bartender(src)
new /obj/item/clothing/under/rank/bartender(src)
new /obj/item/clothing/suit/wcoat(src)
new /obj/item/clothing/suit/wcoat(src)
new /obj/item/clothing/shoes/black(src)
code/game/objects/closets/kitchen.dm
+2 -2
View File
@@ -3,8 +3,8 @@
sleep(2)
new /obj/item/clothing/head/chefhat(src)
new /obj/item/clothing/head/chefhat(src)
new /obj/item/clothing/under/chef(src)
new /obj/item/clothing/under/chef(src)
new /obj/item/clothing/under/rank/chef(src)
new /obj/item/clothing/under/rank/chef(src)
new /obj/item/weapon/kitchen/utensil/fork(src)
new /obj/item/weapon/kitchen/utensil/knife(src)
new /obj/item/weapon/kitchen/utensil/spoon(src)
code/game/objects/items/clothing.dm
+21 -28
View File
@@ -103,13 +103,6 @@ DEATH COMMANDO GAS MASK
var/obj/item/clothing/under/V = new U
src.clothing_choices += V
src.clothing_choices += new /obj/item/clothing/under/bartender
src.clothing_choices += new /obj/item/clothing/under/cargo
src.clothing_choices += new /obj/item/clothing/under/chef
src.clothing_choices += new /obj/item/clothing/under/clown
src.clothing_choices += new /obj/item/clothing/under/det
src.clothing_choices += new /obj/item/clothing/under/librarian
return
@@ -177,36 +170,38 @@ DEATH COMMANDO GAS MASK
icon_state = "death_commando_mask"
item_state = "death_commando_mask"
/obj/item/clothing/under/rank/New()
sensor_mode = pick(0,1,2,3)
..()
/obj/item/clothing/under/var/mode = 1 // 0 - Off, 1 - Binary Lifesigns, 2 - Vitals, 3 - Positioning and Vitals
/obj/item/clothing/under/verb/toggle()
/obj/item/clothing/under/rank/verb/toggle()
set name = "Toggle Suit Sensors"
var/mob/M = usr
if (istype (M, /mob/dead/)) return
if (usr.stat != 0) return
if (istype (src, /obj/item/clothing/under/color/orange/))
mode = 3
usr << "There are no controls for the sensing equipment woven into the fabric."
return
mode += 1
if(mode > 3)
mode = 0
switch(mode)
if (istype(M, /mob/dead/)) return
if (usr.stat) return
if(src.has_sensor >= 2)
usr << "The controls are locked."
return 0
if(src.has_sensor <= 0)
usr << "This suit does not have any sensors"
return 0
src.sensor_mode += 1
if(src.sensor_mode > 3)
src.sensor_mode = 0
switch(src.sensor_mode)
if(0)
usr << "You disable your suit's remote sensing equipment."
if(1)
usr << "You enable your suit's remote sensing equipment. It will now report whether you are live or dead."
usr << "Your suit will now report whether you are live or dead."
if(2)
usr << "You enable more complicated sensors in your suit. It will now report your vital lifesigns."
usr << "Your suit will now report your vital lifesigns."
if(3)
usr << "You activate the full suite of sensors in your suit. It will now report your vital lifesigns as well as your coordinate position."
usr << "Your suit will now report your vital lifesigns as well as your coordinate position."
..()
/obj/item/clothing/under/examine()
/obj/item/clothing/under/rank/examine()
..()
switch(mode)
switch(src.sensor_mode)
if(0)
usr << "Its sensors appear to be disabled."
if(1)
@@ -217,8 +212,6 @@ DEATH COMMANDO GAS MASK
usr << "Its vital tracker and tracking beacon appear to be enabled."
/obj/item/clothing/under/color/orange/mode = 3
/obj/item/clothing/shoes/magboots/attack_self(mob/user as mob)
if(src.magpulse)
src.flags &= ~NOSLIP