From dfdb06ad975007f2d0ffdaf8d7621737419a5b97 Mon Sep 17 00:00:00 2001 From: SoundScopes Date: Tue, 11 Aug 2015 11:27:30 +0100 Subject: [PATCH] Remove SSF that turns out it was a compile error --- .gitignore | 1 + code/game/gamemodes/factions.dm | 3 +-- code/game/gamemodes/game_mode.dm | 3 +-- code/game/objects/items/devices/uplinks.dm | 7 +------ 4 files changed, 4 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 12d7d356..9e0a2fc0 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ data/investigate/gravity.html data/investigate/gravity.html data/investigate/gravity.html data/investigate/gravity.html +.atom-build.json diff --git a/code/game/gamemodes/factions.dm b/code/game/gamemodes/factions.dm index 78c953d1..d376f57f 100644 --- a/code/game/gamemodes/factions.dm +++ b/code/game/gamemodes/factions.dm @@ -143,7 +143,6 @@ Stealth and Camouflage Items; /obj/item/device/chameleon:4:Chameleon-Projector; Whitespace:Seperator; Devices and Tools; -/obj/item/shoe_cover:1:Silent Step Fabric; /obj/item/weapon/card/emag:3:Cryptographic Sequencer; /obj/item/weapon/storage/toolbox/syndicate:1:Fully Loaded Toolbox; /obj/item/weapon/storage/box/syndie_kit/space:3:Space Suit; @@ -216,4 +215,4 @@ Whitespace:Seperator; desc = "The Exolitics are an ancient alien race with an energy-based anatomy. Their culture, communication, morales and knowledge is unknown. They are so radically different to humans that their \ attempts of communication with other life forms is completely incomprehensible. Members of this alien race are capable of broadcasting subspace transmissions from their bodies. \ The religious leaders of the Tiger Cooperative claim to have the technology to decypher and interpret their messages, which have been confirmed as religious propaganda. Their motives are unknown \ - but they are otherwise not considered much of a threat to anyone. They are virtually indestructable because of their nonphysical composition, and have the frighetning ability to make anything stop existing in a second." \ No newline at end of file + but they are otherwise not considered much of a threat to anyone. They are virtually indestructable because of their nonphysical composition, and have the frighetning ability to make anything stop existing in a second." diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index fd586d33..43ef9e1c 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -58,7 +58,6 @@ Stealth and Camouflage Items; /obj/item/device/chameleon:4:Chameleon-Projector; Whitespace:Seperator; Devices and Tools; -/obj/item/shoe_cover:1:Silent Step Fabric; /obj/item/weapon/card/emag:3:Cryptographic Sequencer; /obj/item/weapon/storage/toolbox/syndicate:1:Fully Loaded Toolbox; /obj/item/weapon/storage/box/syndie_kit/space:3:Space Suit; @@ -520,4 +519,4 @@ proc/get_nt_opposed() player.current << "\blue Your current objectives:" for(var/datum/objective/objective in player.objectives) player.current << "Objective #[obj_count]: [objective.explanation_text]" - obj_count++ \ No newline at end of file + obj_count++ diff --git a/code/game/objects/items/devices/uplinks.dm b/code/game/objects/items/devices/uplinks.dm index f1c63cfc..6662b0d0 100644 --- a/code/game/objects/items/devices/uplinks.dm +++ b/code/game/objects/items/devices/uplinks.dm @@ -176,7 +176,6 @@ A list of items and costs is stored under the datum of every game mode, alongsid randomItems.Add("/obj/item/clothing/shoes/syndigaloshes") //No-Slip Syndicate Shoes randomItems.Add("/obj/item/weapon/plastique") //C4 randomItems.Add("/obj/item/weapon/storage/box/syndie_kit/masks_gas") - randomItems.Add("/obj/item/shoe_cover") if(uses > 0) randomItems.Add("/obj/item/weapon/soap/syndie") //Syndicate Soap @@ -208,7 +207,7 @@ A list of items and costs is stored under the datum of every game mode, alongsid uses -= 3 if("/obj/item/ammo_magazine/a357" , "/obj/item/clothing/shoes/syndigaloshes" , "/obj/item/weapon/plastique", "/obj/item/weapon/card/id/syndicate" , "/obj/item/weapon/storage/box/syndie_kit/masks_gas") uses -= 2 - if("/obj/item/weapon/soap/syndie" , "/obj/item/weapon/storage/toolbox/syndicate" , "/obj/item/weapon/storage/box/syndie_kit/masks", "/obj/item/shoe_cover") + if("/obj/item/weapon/soap/syndie" , "/obj/item/weapon/storage/toolbox/syndicate" , "/obj/item/weapon/storage/box/syndie_kit/masks") uses -= 1 del(randomItems) return buyItem @@ -282,10 +281,6 @@ A list of items and costs is stored under the datum of every game mode, alongsid feedback_add_details("traitor_uplink_items_bought","SR") if("/obj/item/clothing/gloves/force/syndicate") feedback_add_details("traitor_uplink_items_bought","FG") - if("/obj/item/shoe_cover") - feedback_add_details("traitor_uplink_items_bought","SFS") -/obj/item/shoe_cover - /obj/item/device/uplink/Topic(href, href_list) if (href_list["buy_item"])