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

Fixed issue 301.

Browse Source 
Fixed a syringe gun runtime.
Added WJohnston's silver head ID, and his new asteroid floor sprites.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3443 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
petethegoat@gmail.com
2012-04-12 20:19:21 +00:00
parent 276db7f50f
commit bf52ba01d4
9 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/jobs/job_controller.dm
+3 -1
View File
@@ -254,7 +254,9 @@ var/global/datum/controller/occupations/job_master
switch(rank)
if("Cyborg")
return
if("Captain")
if( "Head of Personnel" || "Head of Security" || "Chief Engineer" || "Research Director" || "Chief Medical Officer")
C = new /obj/item/weapon/card/id/silver(H)
else if("Captain")
C = new /obj/item/weapon/card/id/gold(H)
else
C = new /obj/item/weapon/card/id(H)
code/game/machinery/doors/airlock.dm
+5 -1
View File
@@ -997,7 +997,7 @@ About the new airlock wires panel:
beingcrowbarred = 0
if( beingcrowbarred && (density && welded && !operating && src.p_open && (!src.arePowerSystemsOn() || stat & NOPOWER) && !src.locked) )
playsound(src.loc, 'Crowbar.ogg', 100, 1)
user.visible_message("[user] removes the electronics from the airlock assembly.", "You start to remove electronics into the airlock assembly.")
user.visible_message("[user] removes the electronics from the airlock assembly.", "You start to remove electronics from the airlock assembly.")
if(do_after(user,40))
user << "\blue You removed the airlock electronics!"
switch(src.doortype)
@@ -1009,6 +1009,10 @@ About the new airlock wires panel:
if(5) new/obj/structure/door_assembly/door_assembly_mai( src.loc )
if(6) new/obj/structure/door_assembly/door_assembly_ext( src.loc )
if(7) new/obj/structure/door_assembly/door_assembly_g( src.loc )
if(14) new/obj/structure/door_assembly/door_assembly_com/glass( src.loc )
if(15) new/obj/structure/door_assembly/door_assembly_eng/glass( src.loc ) //issue 301 -mysthic
if(16) new/obj/structure/door_assembly/door_assembly_sec/glass( src.loc )
if(17) new/obj/structure/door_assembly/door_assembly_med/glass( src.loc )
var/obj/item/weapon/airlock_electronics/ae
if(!electronics)
ae = new/obj/item/weapon/airlock_electronics( src.loc )