diff --git a/baystation12.dme b/baystation12.dme index d72a2530a1d..eb521002a98 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -68,7 +68,6 @@ #include "code\_onclick\hud\screen_objects.dm" #include "code\ATMOSPHERICS\atmospherics.dm" #include "code\ATMOSPHERICS\burstpipe.dm" -#include "code\ATMOSPHERICS\chiller.dm" #include "code\ATMOSPHERICS\datum_pipe_network.dm" #include "code\ATMOSPHERICS\datum_pipeline.dm" #include "code\ATMOSPHERICS\he_pipes.dm" @@ -98,6 +97,8 @@ #include "code\ATMOSPHERICS\components\unary\vent.dm" #include "code\ATMOSPHERICS\components\unary\vent_pump.dm" #include "code\ATMOSPHERICS\components\unary\vent_scrubber.dm" +#include "code\ATMOSPHERICS\hvac\chiller.dm" +#include "code\ATMOSPHERICS\hvac\spaceheater.dm" #include "code\controllers\_DynamicAreaLighting_TG.dm" #include "code\controllers\configuration.dm" #include "code\controllers\failsafe.dm" diff --git a/code/ATMOSPHERICS/chiller.dm b/code/ATMOSPHERICS/hvac/chiller.dm similarity index 64% rename from code/ATMOSPHERICS/chiller.dm rename to code/ATMOSPHERICS/hvac/chiller.dm index abd65f193a9..3558038097b 100644 --- a/code/ATMOSPHERICS/chiller.dm +++ b/code/ATMOSPHERICS/hvac/chiller.dm @@ -3,7 +3,7 @@ anchored = 0 density = 1 icon = 'icons/obj/atmos.dmi' - icon_state = "aircond0" + icon_state = "aircond" name = "air conditioner" desc = "If you can't take the heat, use one of these." set_temperature = 20 // in celcius, add T0C for kelvin @@ -20,64 +20,8 @@ update_icon() return -/obj/machinery/space_heater/air_conditioner/update_icon() - overlays.len = 0 - icon_state = "aircond[on]" - if(open) - overlays += "sheater-open" - return - -/obj/machinery/space_heater/air_conditioner/examine(mob/user) - ..() - user << "The air conditioner is [on ? "on" : "off"] and the hatch is [open ? "open" : "closed"]." - if(open) - user << "The power cell is [cell ? "installed" : "missing"]." - else - user << "The charge meter reads [cell ? round(cell.percent(),1) : 0]%" - -/obj/machinery/space_heater/air_conditioner/emp_act(severity) - if(stat & (BROKEN|NOPOWER)) - ..(severity) - return - if(cell) - cell.emp_act(severity) - ..(severity) - -/obj/machinery/space_heater/air_conditioner/attackby(obj/item/I, mob/user) - if(istype(I, /obj/item/weapon/cell)) - if(open) - if(cell) - user << "There is already a power cell inside." - return - else - // insert cell - var/obj/item/weapon/cell/C = usr.get_active_hand() - if(istype(C)) - user.drop_item() - cell = C - C.loc = src - C.add_fingerprint(usr) - - user.visible_message("[user] inserts a power cell into [src].", "You insert the power cell into [src].") - else - user << "The hatch must be open to insert a power cell." - return - else if(istype(I, /obj/item/weapon/screwdriver)) - open = !open - user.visible_message("[user] [open ? "opens" : "closes"] the hatch on the [src].", "You [open ? "open" : "close"] the hatch on the [src].") - update_icon() - if(!open && user.machine == src) - user << browse(null, "window=aircond") - user.unset_machine() - else - ..() - return -/obj/machinery/space_heater/air_conditioner/attack_hand(mob/user as mob) - src.add_fingerprint(user) - interact(user) - /obj/machinery/space_heater/air_conditioner/interact(mob/user as mob) - if(open) + if(panel_open) var/temp = set_temperature var/dat dat = "Power cell: " @@ -118,11 +62,11 @@ if("temp") var/value = text2num(href_list["val"]) - // limit to 15c and 20c(room temp) - set_temperature = dd_range(15, 25, set_temperature + value) + // limit to 0c and 25c(room temp) + set_temperature = dd_range(0, 25, set_temperature + value) if("cellremove") - if(open && cell && !usr.get_active_hand()) + if(panel_open && cell && !usr.get_active_hand()) cell.updateicon() usr.put_in_hands(cell) cell.add_fingerprint(usr) @@ -131,7 +75,7 @@ if("cellinstall") - if(open && !cell) + if(panel_open && !cell) var/obj/item/weapon/cell/C = usr.get_active_hand() if(istype(C)) usr.drop_item() diff --git a/code/game/machinery/spaceheater.dm b/code/ATMOSPHERICS/hvac/spaceheater.dm similarity index 91% rename from code/game/machinery/spaceheater.dm rename to code/ATMOSPHERICS/hvac/spaceheater.dm index 090453a47f4..d3d0aac9a03 100644 --- a/code/game/machinery/spaceheater.dm +++ b/code/ATMOSPHERICS/hvac/spaceheater.dm @@ -2,12 +2,11 @@ anchored = 0 density = 1 icon = 'icons/obj/atmos.dmi' - icon_state = "sheater0" + icon_state = "sheater" name = "space heater" desc = "Made by Space Amish using traditional space techniques, this heater is guaranteed not to set the station on fire." var/obj/item/weapon/cell/cell var/on = 0 - var/open = 0 var/set_temperature = 50 // in celcius, add T0C for kelvin var/heating_power = 40000 @@ -28,15 +27,15 @@ /obj/machinery/space_heater/update_icon() overlays.len = 0 - icon_state = "sheater[on]" - if(open) - overlays += "sheater-open" + icon_state = "[initial(icon_state)][on]" + if(panel_open) + overlays += "[initial(icon_state)]-open" return /obj/machinery/space_heater/examine(mob/user) ..() - user << "The heater is [on ? "on" : "off"] and the hatch is [open ? "open" : "closed"]." - if(open) + user << "\icon[src]\The [src.name] is [on ? "on" : "off"] and the hatch is [panel_open ? "open" : "closed"]." + if(panel_open) user << "The power cell is [cell ? "installed" : "missing"]." else user << "The charge meter reads [cell ? round(cell.percent(),1) : 0]%" @@ -52,7 +51,7 @@ /obj/machinery/space_heater/attackby(obj/item/I, mob/user) ..() if(istype(I, /obj/item/weapon/cell)) - if(open) + if(panel_open) if(cell) user << "There is already a power cell inside." return @@ -74,7 +73,7 @@ /obj/machinery/space_heater/togglePanelOpen(var/obj/toggleitem, mob/user) ..() update_icon() - if(!open && user.machine == src) + if(!panel_open && user.machine == src) user << browse(null, "window=spaceheater") user.unset_machine() @@ -86,7 +85,7 @@ /obj/machinery/space_heater/interact(mob/user as mob) - if(open) + if(panel_open) var/dat dat = "Power cell: " @@ -130,10 +129,10 @@ var/value = text2num(href_list["val"]) // limit to 20-90 degC - set_temperature = dd_range(0, 90, set_temperature + value) + set_temperature = dd_range(20, 90, set_temperature + value) if("cellremove") - if(open && cell && !usr.get_active_hand()) + if(panel_open && cell && !usr.get_active_hand()) cell.updateicon() usr.put_in_hands(cell) cell.add_fingerprint(usr) @@ -141,7 +140,7 @@ usr.visible_message("[usr] removes the power cell from \the [src].", "You remove the power cell from \the [src].") if("cellinstall") - if(open && !cell) + if(panel_open && !cell) var/obj/item/weapon/cell/C = usr.get_active_hand() if(istype(C)) usr.drop_item() diff --git a/html/changelog.html b/html/changelog.html index bc585870caa..8c90ea24b9d 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -79,6 +79,41 @@ ADDING CREDITS? EDIT templates/header.html (or footer.html if they're for old t --> +
+

2015.02.06

+

Clusterfack updated:

+ +

Deity Link updated:

+ +

Duny updated:

+ +

Pomf123 updated:

+ +
+

2015.02.05

Angelite Entyshak updated:

diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index d134dfd95c5..1899b9c355b 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -2108,3 +2108,49 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. Vasby: - rscadd: Excavation Drill designed to replace xenoarch's excavation kit! Must be researched in R&D. +2015-02-06: + Clusterfack: + - bugfix: Bag of holdings now explode upon collision with a singularity again + - tweak: Broken bottles have had their size changed and now fit in trash bags + - rscadd: Microwaves can be moved onto tables now + Deity Link: + - rscadd: Engineer PDA cartridges now grant access to an app that connects to the + Station Alert Computers on the Z-level (the same way that the Power Monitor + app connects to Power Monitoring Computers). + - tweak: The Power Monitor app can now only connect to Power Monitoring Computers + on its Z-level. + - bugfix: Fixed a bug that sometimes caused the "denied" animation to flicker if + a player bumps into a door while it is already opening. + - bugfix: Fixed a bug that caused doors to always show their "denied" animation + while opening when Mechs bump into them. + - bugfix: Fixed Shuttle/Pod doors opening/closing animations that used to loop instead + of playing only once. Also shortened their delay so they now behave more like + regular airlocks. + - rscadd: vehicles (like Janicart or Firebird) can now open doors simply by bumping + into them. Like players would. + - bugfix: Fixed a bug that caused Request Console to always send normal priority + messages (never high priority). + - tweak: Request Consoles receiving normal priority messages now use their old High + Priority sprite. Consoles receiving high priority messages now use their unused + Extreme Priority sprite (yes, there was a scrapped Extreme priority). + - soundadd: Added new sounds for when messages are received on the Request Consoles. + Duny: + - wip: Made a lot of changes to areas to separate maintenance and the unused parts + of the station. Hopefully this will help retards who can't even follow a line + on the floor find their way and help with ventcrawling as there should be less + AFT STARBOARD MAINT VENT NUMBER 56 situations. All the unused areas are not + powered by default (empty apc) and aren't shielded from radiations. The special + rooms (abandoned diner, bar, library) have been made into their own areas too + to facilitate autism. Also cleaned up maintenance (only took two centuries), + and added a lot of random loot. + - rscdel: Removed most of the loot I added/chose not to remove earlier in those + parts since I have no way of preventing players from rushing to it every round. + - tweak: Didn't add more newscasters to the station because the faggot who wants + more of them refused to make an issue on github just so he could say I ignore + them. + - rscadd: Added a newscaster to the librarian's dungeon anyway. + - rscadd: Added a supermatter shard to the derelict, in the engine room. + Pomf123: + - bugfix: Fixed spaceheaters not actually opening when you use a screwdriver. + - bugfix: Airconditioner won't display heater and airconditioner information when + examined. diff --git a/html/changelogs/Clusterfack_2830.yml b/html/changelogs/Clusterfack_2830.yml deleted file mode 100644 index a63e23d3005..00000000000 --- a/html/changelogs/Clusterfack_2830.yml +++ /dev/null @@ -1,6 +0,0 @@ -author: Clusterfack -delete-after: true -changes: -- bugfix: Bag of holdings now explode upon collision with a singularity again -- tweak: Broken bottles have had their size changed and now fit in trash bags -- rscadd: Microwaves can be moved onto tables now diff --git a/html/changelogs/DeityLink_2721.yml b/html/changelogs/DeityLink_2721.yml deleted file mode 100644 index a5861e60eb2..00000000000 --- a/html/changelogs/DeityLink_2721.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: Deity Link -delete-after: true -changes: - - rscadd: Engineer PDA cartridges now grant access to an app that connects to the Station Alert Computers on the Z-level (the same way that the Power Monitor app connects to Power Monitoring Computers). - - tweak: The Power Monitor app can now only connect to Power Monitoring Computers on its Z-level. diff --git a/html/changelogs/DeityLink_2722.yml b/html/changelogs/DeityLink_2722.yml deleted file mode 100644 index 08dcc928e7d..00000000000 --- a/html/changelogs/DeityLink_2722.yml +++ /dev/null @@ -1,6 +0,0 @@ -author: Deity Link -delete-after: true -changes: - - bugfix: Fixed a bug that sometimes caused the "denied" animation to flicker if a player bumps into a door while it is already opening. - - bugfix: Fixed a bug that caused doors to always show their "denied" animation while opening when Mechs bump into them. - - bugfix: Fixed Shuttle/Pod doors opening/closing animations that used to loop instead of playing only once. Also shortened their delay so they now behave more like regular airlocks. diff --git a/html/changelogs/DeityLink_2747.yml b/html/changelogs/DeityLink_2747.yml deleted file mode 100644 index 9a41de148ab..00000000000 --- a/html/changelogs/DeityLink_2747.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: Deity Link -delete-after: true -changes: - - rscadd: vehicles (like Janicart or Firebird) can now open doors simply by bumping into them. Like players would. diff --git a/html/changelogs/DeityLink_2754.yml b/html/changelogs/DeityLink_2754.yml deleted file mode 100644 index 80f08c224b1..00000000000 --- a/html/changelogs/DeityLink_2754.yml +++ /dev/null @@ -1,6 +0,0 @@ -author: Deity Link -delete-after: true -changes: - - bugfix: Fixed a bug that caused Request Console to always send normal priority messages (never high priority). - - tweak: Request Consoles receiving normal priority messages now use their old High Priority sprite. Consoles receiving high priority messages now use their unused Extreme Priority sprite (yes, there was a scrapped Extreme priority). - - soundadd: Added new sounds for when messages are received on the Request Consoles. diff --git a/html/changelogs/Duny.yml b/html/changelogs/Duny.yml index 42a8c950a65..36c8befc26f 100644 --- a/html/changelogs/Duny.yml +++ b/html/changelogs/Duny.yml @@ -1,7 +1,2 @@ author: Duny -changes: - - wip: Made a lot of changes to areas to separate maintenance and the unused parts of the station. Hopefully this will help retards who can't even follow a line on the floor find their way and help with ventcrawling as there should be less AFT STARBOARD MAINT VENT NUMBER 56 situations. All the unused areas are not powered by default (empty apc) and aren't shielded from radiations. The special rooms (abandoned diner, bar, library) have been made into their own areas too to facilitate autism. Also cleaned up maintenance (only took two centuries), and added a lot of random loot. - - rscdel: Removed most of the loot I added/chose not to remove earlier in those parts since I have no way of preventing players from rushing to it every round. - - tweak: Didn't add more newscasters to the station because the faggot who wants more of them refused to make an issue on github just so he could say I ignore them. - - rscadd: Added a newscaster to the librarian's dungeon anyway. - - rscadd: Added a supermatter shard to the derelict, in the engine room. \ No newline at end of file +changes: [] diff --git a/icons/obj/atmos.dmi b/icons/obj/atmos.dmi index eafed5a4f63..516be5f4f1b 100644 Binary files a/icons/obj/atmos.dmi and b/icons/obj/atmos.dmi differ