diff --git a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm
index 0c8d5d30a39..8ff15ce55d4 100644
--- a/code/game/gamemodes/nuclear/nuclear.dm
+++ b/code/game/gamemodes/nuclear/nuclear.dm
@@ -18,8 +18,7 @@
var/nukes_left = 1 // Call 3714-PRAY right now and order more nukes! Limited offer!
var/nuke_off_station = 0 //Used for tracking if the syndies actually haul the nuke to the station
- var/herp = 0 //Used for tracking if the syndies got the shuttle off of the z-level
- //It is so hillarious so I wont rename those two variables --rastaf0
+ var/syndies_didnt_escape = 0 //Used for tracking if the syndies got the shuttle off of the z-level
/datum/game_mode/nuclear/announce()
@@ -229,10 +228,10 @@
synd_mob.equip_to_slot_or_del(new /obj/item/weapon/card/id/syndicate(synd_mob), slot_wear_id)
if(synd_mob.backbag == 2) synd_mob.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(synd_mob), slot_back)
if(synd_mob.backbag == 3) synd_mob.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_norm(synd_mob), slot_back)
- synd_mob.equip_to_slot_or_del(new /obj/item/ammo_magazine/a50(synd_mob), slot_in_backpack)
- synd_mob.equip_to_slot_or_del(new /obj/item/ammo_magazine/a50(synd_mob), slot_in_backpack)
+ synd_mob.equip_to_slot_or_del(new /obj/item/ammo_magazine/a12mm(synd_mob), slot_in_backpack)
+ synd_mob.equip_to_slot_or_del(new /obj/item/ammo_magazine/a12mm(synd_mob), slot_in_backpack)
synd_mob.equip_to_slot_or_del(new /obj/item/weapon/reagent_containers/pill/cyanide(synd_mob), slot_in_backpack)
- synd_mob.equip_to_slot_or_del(new /obj/item/weapon/gun/projectile/deagle(synd_mob), slot_belt)
+ synd_mob.equip_to_slot_or_del(new /obj/item/weapon/gun/projectile/automatic/c20r(synd_mob), slot_belt)
synd_mob.equip_to_slot_or_del(new /obj/item/weapon/storage/box/engineer(synd_mob.back), slot_in_backpack)
var/obj/item/weapon/implant/explosive/E = new/obj/item/weapon/implant/explosive(synd_mob)
E.imp_in = synd_mob
@@ -269,25 +268,25 @@
//nukes_left
//station_was_nuked
- //derp //Used for tracking if the syndies actually haul the nuke to the station
- //herp //Used for tracking if the syndies got the shuttle off of the z-level
+ //derp //Used for tracking if the syndies actually haul the nuke to the station //no
+ //herp //Used for tracking if the syndies got the shuttle off of the z-level //NO, DON'T FUCKING NAME VARS LIKE THIS
- if (!disk_rescued && station_was_nuked && !herp)
+ if (!disk_rescued && station_was_nuked && !syndies_didnt_escape)
feedback_set_details("round_end_result","win - syndicate nuke")
world << "Syndicate Major Victory!"
world << "[syndicate_name()] operatives have destroyed [station_name()]!"
- else if (!disk_rescued && station_was_nuked && herp)
+ else if (!disk_rescued && station_was_nuked && syndies_didnt_escape)
feedback_set_details("round_end_result","halfwin - syndicate nuke - did not evacuate in time")
world << "Total Annihilation"
world << "[syndicate_name()] operatives destroyed [station_name()] but did not leave the area in time and got caught in the explosion. Next time, don't lose the disk!"
- else if (!disk_rescued && !station_was_nuked && nuke_off_station && !herp)
+ else if (!disk_rescued && !station_was_nuked && nuke_off_station && !syndies_didnt_escape)
feedback_set_details("round_end_result","halfwin - blew wrong station")
world << "Crew Minor Victory"
world << "[syndicate_name()] operatives secured the authentication disk but blew up something that wasn't [station_name()]. Next time, don't lose the disk!"
- else if (!disk_rescued && !station_was_nuked && nuke_off_station && herp)
+ else if (!disk_rescued && !station_was_nuked && nuke_off_station && syndies_didnt_escape)
feedback_set_details("round_end_result","halfwin - blew wrong station - did not evacuate in time")
world << "[syndicate_name()] operatives have earned Darwin Award!"
world << "[syndicate_name()] operatives blew up something that wasn't [station_name()] and got caught in the explosion. Next time, don't lose the disk!"
diff --git a/code/game/gamemodes/nuclear/nuclearbomb.dm b/code/game/gamemodes/nuclear/nuclearbomb.dm
index 4168fbcc43e..40e81b18b8d 100644
--- a/code/game/gamemodes/nuclear/nuclearbomb.dm
+++ b/code/game/gamemodes/nuclear/nuclearbomb.dm
@@ -184,7 +184,7 @@
if (ticker)
if(ticker.mode && ticker.mode.name == "nuclear emergency")
- ticker.mode:herp = syndicate_station_at_station
+ ticker.mode:syndies_didnt_escape = syndicate_station_at_station
ticker.mode:nuke_off_station = off_station
ticker.station_explosion_cinematic(off_station,null)
if(ticker.mode)
diff --git a/code/game/machinery/computer/pod.dm b/code/game/machinery/computer/pod.dm
index f8e6894b3f4..0d83d83caab 100644
--- a/code/game/machinery/computer/pod.dm
+++ b/code/game/machinery/computer/pod.dm
@@ -165,41 +165,38 @@
/obj/machinery/computer/pod/Topic(href, href_list)
if(..())
return
- if ((usr.contents.Find(src) || (in_range(src, usr) && istype(loc, /turf))) || (istype(usr, /mob/living/silicon)))
+ if((usr.contents.Find(src) || (in_range(src, usr) && istype(loc, /turf))) || (istype(usr, /mob/living/silicon)))
usr.machine = src
- if (href_list["power"])
+ if(href_list["power"])
var/t = text2num(href_list["power"])
t = min(max(0.25, t), 16)
if (connected)
connected.power = t
else
- if (href_list["alarm"])
+ if(href_list["alarm"])
alarm()
else
- if (href_list["time"])
+ if(href_list["time"])
timing = text2num(href_list["time"])
else
- if (href_list["tp"])
+ if(href_list["tp"])
var/tp = text2num(href_list["tp"])
time += tp
time = min(max(round(time), 0), 120)
else
- if (href_list["door"])
+ if(href_list["door"])
if(istype(src, /obj/machinery/computer/pod/old/syndicate))//Added here so Nuke ops don't go running naked into space before moving the shuttle.
if(syndicate_station_at_station == 0)
usr << "\red You need to launch the Syndicate Shuttle via the computer terminal at the head of the ship before departing."
return
for(var/obj/machinery/door/poddoor/M in world)
- if (M.id == id)
- if (M.density)
- spawn( 0 )
- M.open()
+ if(M.id == id)
+ if(M.density)
+ M.open()
return
else
- spawn( 0 )
- M.close()
+ M.close()
return
- //Foreach goto(298)
add_fingerprint(usr)
updateUsrDialog()
return
diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm
index 61435c75693..c8eb1fa836b 100644
--- a/code/game/objects/items/devices/PDA/PDA.dm
+++ b/code/game/objects/items/devices/PDA/PDA.dm
@@ -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)
diff --git a/code/game/objects/items/devices/uplinks.dm b/code/game/objects/items/devices/uplinks.dm
index 13aa67b495c..f4c290a6032 100644
--- a/code/game/objects/items/devices/uplinks.dm
+++ b/code/game/objects/items/devices/uplinks.dm
@@ -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)
diff --git a/code/game/objects/structures/crates_lockers/closets/syndicate.dm b/code/game/objects/structures/crates_lockers/closets/syndicate.dm
index 790237b2eb6..b24147eee27 100644
--- a/code/game/objects/structures/crates_lockers/closets/syndicate.dm
+++ b/code/game/objects/structures/crates_lockers/closets/syndicate.dm
@@ -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)
diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm
index 9630d1001f1..f752eea47ff 100644
--- a/code/modules/projectiles/projectile/bullets.dm
+++ b/code/modules/projectiles/projectile/bullets.dm
@@ -14,11 +14,9 @@
/obj/item/projectile/bullet/midbullet
- damage = 30
-/* stun = 5
- weaken = 5 // Nope, fuck you, nuke teams.
- eyeblur = 3 // Use the egun scrubs.
-*/
+ damage = 20
+ stun = 5
+ weaken = 5
/obj/item/projectile/bullet/suffocationbullet//How does this even work?
name = "co bullet"