From 69cea1fdd2ca25b7bbf4b69f30eb0f8515c42cff Mon Sep 17 00:00:00 2001 From: Kurfursten Date: Thu, 16 Jul 2015 16:19:32 -0500 Subject: [PATCH] Such is life --- code/datums/supplypacks.dm | 10 ++++++++++ code/game/machinery/newscaster.dm | 10 ++++++++-- code/game/machinery/vending.dm | 3 +-- code/game/objects/items/stacks/sheets/sheet_types.dm | 2 -- 4 files changed, 19 insertions(+), 6 deletions(-) diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm index d93ac0bbc63..1581c3c7eb0 100755 --- a/code/datums/supplypacks.dm +++ b/code/datums/supplypacks.dm @@ -132,6 +132,16 @@ var/list/all_supply_groups = list("Supplies","Clothing","Security","Hospitality" containername = "High efficiency lights" group = "Supplies" +/datum/supply_packs/newscaster + name = "Newscaster crate" + contains = list(/obj/item/mounted/frame/newscaster, + /obj/item/mounted/frame/newscaster, + /obj/item/mounted/frame/newscaster) + cost = 10 + containertype = /obj/structure/closet/crate + containername = "Newscaster crate" + group = "Supplies" + /datum/supply_packs/mule name = "MULEbot Crate" contains = list(/obj/machinery/bot/mulebot) diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm index 27679fc4e79..ea95e2b486d 100644 --- a/code/game/machinery/newscaster.dm +++ b/code/game/machinery/newscaster.dm @@ -130,13 +130,19 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co name = "Security Newscaster" securityCaster = 1 -/obj/machinery/newscaster/New() //Constructor, ho~ +/obj/machinery/newscaster/New(turf/loc, var/ndir=0) + if(ndir) + dir=ndir + else + dir = reverse_direction(dir) //Unfucks all maps + pixel_x = (dir & 3)? 0 : (dir == 4 ? 28 : -28) + pixel_y = (dir & 3)? (dir ==1 ? 33 : -28) : 0 allCasters += src src.paper_remaining = 15 // Will probably change this to something better for(var/obj/machinery/newscaster/NEWSCASTER in allCasters) // Let's give it an appropriate unit number src.unit_no++ src.update_icon() //for any custom ones on the map... - ..() //I just realised the newscasters weren't in the global machines list. The superconstructor call will tend to that + ..() /obj/machinery/newscaster/Destroy() allCasters -= src diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index f805b6bd45a..26fd8847b98 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -1507,7 +1507,6 @@ /obj/item/weapon/circuitboard/air_alarm = 10, /obj/item/weapon/intercom_electronics = 10, /obj/item/weapon/cell/high = 10, - /obj/item/mounted/frame/newscaster = 10, /obj/item/weapon/reagent_containers/glass/fuelcan = 5, ) contraband = list( @@ -2035,4 +2034,4 @@ prices = list(/obj/item/weapon/reagent_containers/food/drinks/soda_cans/nuka = 20, /obj/item/weapon/reagent_containers/food/drinks/soda_cans/quantum = 50) contraband = list(/obj/item/weapon/reagent_containers/food/drinks/soda_cans/quantum = 5) - pack = /obj/structure/vendomatpack/nuka + pack = /obj/structure/vendomatpack/nuka diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index 7f2f9daa014..bade9b7b92f 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -68,8 +68,6 @@ var/global/list/datum/stack_recipe/metal_recipes = list ( \ new/datum/stack_recipe("fire alarm frame", /obj/item/mounted/frame/firealarm, 2 ), \ new/datum/stack_recipe("lightswitch frame", /obj/item/mounted/frame/light_switch, 2 ), \ new/datum/stack_recipe("intercom frame", /obj/item/mounted/frame/intercom, 2 ), \ - new/datum/stack_recipe("requests console", /obj/machinery/requests_console, 2 ), \ - new/datum/stack_recipe("ATM", /obj/machinery/atm/, 2 ), \ new/datum/stack_recipe("nanomed frame", /obj/item/mounted/frame/wallmed, 3, time = 25, one_per_turf = 0, on_floor = 1), \ new/datum/stack_recipe("light fixture frame", /obj/item/mounted/frame/light_fixture, 2 ), \ new/datum/stack_recipe("small light fixture frame", /obj/item/mounted/frame/light_fixture/small, 1 ), \