cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-30 23:48:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes issue 929.

Browse Source 
Changed nuke ops to use buffed C20Rs again, hurray!
Cleaned up the nuke shuttle code in preparation for fixing issue 854, and renamed var/derp.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4701 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
petethegoat@gmail.com
2012-09-16 12:42:58 +00:00
parent 33c738de3e
commit 99745c2295
7 changed files with 35 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/devices/PDA/PDA.dm
+5 -7
View File
@@ -595,15 +595,13 @@ var/global/list/obj/item/device/pda/PDAs = list()
//SYNDICATE FUNCTIONS===================================
if("Toggle Door")
if(!isnull(cartridge) && cartridge.access_remote_door)
if(cartridge && cartridge.access_remote_door)
for(var/obj/machinery/door/poddoor/M in machines)
if(M.id == cartridge.remote_door_id)
if(M.density)
spawn(0)
M.open()
M.open()
else
spawn(0)
M.close()
M.close()
if("Detonate")//Detonate PDA
if(istype(cartridge, /obj/item/weapon/cartridge/syndicate))
@@ -614,7 +612,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
var/difficulty = 0
if (!isnull(P.cartridge))
if(P.cartridge)
difficulty += P.cartridge.access_medical
difficulty += P.cartridge.access_security
difficulty += P.cartridge.access_engine
@@ -624,7 +622,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
else
difficulty += 2
if ((prob(difficulty * 12)) || (P.hidden_uplink))
if(prob(difficulty * 12) || (P.hidden_uplink))
U.show_message("\red An error flashes on your [src].", 1)
else if (prob(difficulty * 3))
U.show_message("\red Energy feeds back into your [src]!", 1)
code/game/objects/items/devices/uplinks.dm
+1
View File
@@ -350,6 +350,7 @@ A list of items and costs is stored under the datum of every game mode, alongsid
/obj/item/device/radio/uplink/New()
hidden_uplink = new(src)
icon_state = "radio"
/obj/item/device/radio/uplink/attack_self(mob/user as mob)
if(hidden_uplink)
code/game/objects/structures/crates_lockers/closets/syndicate.dm
+5 -5
View File
@@ -30,11 +30,11 @@
/obj/structure/closet/syndicate/nuclear/New()
..()
sleep(2)
new /obj/item/ammo_magazine/a50(src)
new /obj/item/ammo_magazine/a50(src)
new /obj/item/ammo_magazine/a50(src)
new /obj/item/ammo_magazine/a50(src)
new /obj/item/ammo_magazine/a50(src)
new /obj/item/ammo_magazine/a12mm(src)
new /obj/item/ammo_magazine/a12mm(src)
new /obj/item/ammo_magazine/a12mm(src)
new /obj/item/ammo_magazine/a12mm(src)
new /obj/item/ammo_magazine/a12mm(src)
new /obj/item/weapon/storage/handcuff_kit(src)
new /obj/item/weapon/storage/flashbang_kit(src)
new /obj/item/weapon/gun/energy/gun(src)