TG: Fixed a syringe gun runtime.

Added WJohnston's silver head ID, and his new asteroid floor sprites.
Revision: r3443
Author: 	 petethegoat
This commit is contained in:
Ren Erthilo
2012-05-03 01:43:10 +01:00
parent 4fccc35067
commit 2dfa127760
6 changed files with 9 additions and 3 deletions

View File

@@ -288,7 +288,9 @@ var/global/datum/controller/occupations/job_master
switch(rank) switch(rank)
if("Cyborg") if("Cyborg")
return 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) C = new /obj/item/weapon/card/id/gold(H)
else else
C = new /obj/item/weapon/card/id(H) C = new /obj/item/weapon/card/id(H)

View File

@@ -403,7 +403,7 @@ Airlock index -> wire color are { 9, 4, 6, 7, 5, 8, 1, 2, 3 }.
beingcrowbarred = 0 beingcrowbarred = 0
if( beingcrowbarred && (density && welded && !operating && src.p_open && (!src.arePowerSystemsOn() || stat & NOPOWER) && !src.locked) ) if( beingcrowbarred && (density && welded && !operating && src.p_open && (!src.arePowerSystemsOn() || stat & NOPOWER) && !src.locked) )
playsound(src.loc, 'Crowbar.ogg', 100, 1) 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)) if(do_after(user,40))
user << "\blue You removed the airlock electronics!" user << "\blue You removed the airlock electronics!"
switch(src.doortype) switch(src.doortype)
@@ -415,6 +415,10 @@ Airlock index -> wire color are { 9, 4, 6, 7, 5, 8, 1, 2, 3 }.
if(5) new/obj/structure/door_assembly/door_assembly_mai( src.loc ) 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(6) new/obj/structure/door_assembly/door_assembly_ext( src.loc )
if(7) new/obj/structure/door_assembly/door_assembly_g( 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 var/obj/item/weapon/airlock_electronics/ae
if (!electronics) if (!electronics)
ae = new/obj/item/weapon/airlock_electronics( src.loc ) ae = new/obj/item/weapon/airlock_electronics( src.loc )

View File

@@ -284,7 +284,7 @@
// seedName = pick(list("1","2","3","4")) // seedName = pick(list("1","2","3","4"))
// seedAmt = rand(1,4) // seedAmt = rand(1,4)
if(prob(20)) if(prob(20))
icon_state = "asteroid[rand(0,8)]" icon_state = "asteroid[rand(0,12)]"
spawn(2) spawn(2)
updateMineralOverlays() updateMineralOverlays()

Binary file not shown.

Before

Width:  |  Height:  |  Size: 119 KiB

After

Width:  |  Height:  |  Size: 119 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 120 KiB

After

Width:  |  Height:  |  Size: 120 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.5 KiB

After

Width:  |  Height:  |  Size: 5.4 KiB