From 5821dd81ad6cc7bcddc8df741ef46def02cbb4be Mon Sep 17 00:00:00 2001 From: Akke Date: Mon, 21 Dec 2015 13:37:31 +0000 Subject: [PATCH 1/4] we dont have a shotgun tree you know --- .../objects/structures/crates_lockers/closets/syndicate.dm | 5 ----- 1 file changed, 5 deletions(-) diff --git a/code/game/objects/structures/crates_lockers/closets/syndicate.dm b/code/game/objects/structures/crates_lockers/closets/syndicate.dm index a44de8f144d..792d5b167b3 100644 --- a/code/game/objects/structures/crates_lockers/closets/syndicate.dm +++ b/code/game/objects/structures/crates_lockers/closets/syndicate.dm @@ -31,11 +31,6 @@ new /obj/item/weapon/storage/box/flashbangs(src) new /obj/item/weapon/storage/box/teargas(src) new /obj/item/weapon/storage/backpack/dufflebag/syndie/med(src) - new /obj/item/weapon/gun/projectile/automatic/shotgun/bulldog(src) - new /obj/item/weapon/gun/projectile/automatic/shotgun/bulldog(src) - new /obj/item/weapon/gun/projectile/automatic/shotgun/bulldog(src) - new /obj/item/weapon/gun/projectile/automatic/shotgun/bulldog(src) - new /obj/item/weapon/gun/projectile/automatic/shotgun/bulldog(src) new /obj/item/weapon/pinpointer/nukeop(src) new /obj/item/weapon/pinpointer/nukeop(src) new /obj/item/weapon/pinpointer/nukeop(src) From db23604952e5129862193d138bb000284a860fb3 Mon Sep 17 00:00:00 2001 From: Akke Date: Thu, 24 Dec 2015 18:56:36 +0000 Subject: [PATCH 2/4] adds 10 more tc to op uplink for total of 30 --- code/game/objects/items/devices/uplinks.dm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/code/game/objects/items/devices/uplinks.dm b/code/game/objects/items/devices/uplinks.dm index d60f5efddd1..bb40582afc5 100644 --- a/code/game/objects/items/devices/uplinks.dm +++ b/code/game/objects/items/devices/uplinks.dm @@ -193,6 +193,7 @@ var/list/world_uplinks = list() /obj/item/device/radio/uplink/New() hidden_uplink = new(src) icon_state = "radio" + hidden_uplink.uses = 30 /obj/item/device/radio/uplink/attack_self(mob/user) if(hidden_uplink) @@ -211,7 +212,4 @@ var/list/world_uplinks = list() /obj/item/device/radio/headset/uplink/New() ..() hidden_uplink = new(src) - hidden_uplink.uses = 20 - - - + hidden_uplink.uses = 20 \ No newline at end of file From c7d91019ec4de64e8da4d456df63bc276d88ffd5 Mon Sep 17 00:00:00 2001 From: Akke Date: Fri, 25 Dec 2015 01:02:29 +0000 Subject: [PATCH 3/4] final revision --- code/game/gamemodes/nuclear/nuclear.dm | 2 +- code/game/objects/items/devices/uplinks.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm index da015bfe940..58ca5ee53e4 100644 --- a/code/game/gamemodes/nuclear/nuclear.dm +++ b/code/game/gamemodes/nuclear/nuclear.dm @@ -306,7 +306,7 @@ belt = /obj/item/weapon/gun/projectile/automatic/pistol backpack_contents = list(/obj/item/weapon/storage/box/engineer=1) - var/tc = 20 + var/tc = 30 /datum/outfit/syndicate/no_crystals tc = 0 diff --git a/code/game/objects/items/devices/uplinks.dm b/code/game/objects/items/devices/uplinks.dm index bb40582afc5..bff49552851 100644 --- a/code/game/objects/items/devices/uplinks.dm +++ b/code/game/objects/items/devices/uplinks.dm @@ -193,7 +193,7 @@ var/list/world_uplinks = list() /obj/item/device/radio/uplink/New() hidden_uplink = new(src) icon_state = "radio" - hidden_uplink.uses = 30 + hidden_uplink.uses = 20 /obj/item/device/radio/uplink/attack_self(mob/user) if(hidden_uplink) From 019f460dc9ed2e774f15df20706216781510f354 Mon Sep 17 00:00:00 2001 From: LanCartwright Date: Fri, 25 Dec 2015 01:15:49 +0000 Subject: [PATCH 4/4] Update uplinks.dm --- code/game/objects/items/devices/uplinks.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/code/game/objects/items/devices/uplinks.dm b/code/game/objects/items/devices/uplinks.dm index bff49552851..968ac08cf1d 100644 --- a/code/game/objects/items/devices/uplinks.dm +++ b/code/game/objects/items/devices/uplinks.dm @@ -193,7 +193,6 @@ var/list/world_uplinks = list() /obj/item/device/radio/uplink/New() hidden_uplink = new(src) icon_state = "radio" - hidden_uplink.uses = 20 /obj/item/device/radio/uplink/attack_self(mob/user) if(hidden_uplink) @@ -212,4 +211,4 @@ var/list/world_uplinks = list() /obj/item/device/radio/headset/uplink/New() ..() hidden_uplink = new(src) - hidden_uplink.uses = 20 \ No newline at end of file + hidden_uplink.uses = 20