cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-25 04:57:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11403 from PsiOmegaDelta/dev

Browse Source 
Dev
This commit is contained in:
PsiOmegaDelta
2015-11-02 10:13:18 +01:00
parent ba3c1f03d7 dc4d01cc80
commit 77b802a91b
8 changed files with 1509 additions and 1431 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/computer/computer.dm
-5
View File
@@ -20,11 +20,6 @@
overlay_layer = layer
..()
/obj/machinery/computer/Destroy()
qdel(circuit)
circuit = null
return ..()
/obj/machinery/computer/initialize()
power_change()
update_icon()
code/game/objects/items/weapons/circuitboards/computer/air_management.dm
+110 -2
View File
@@ -1,27 +1,135 @@
#ifndef T_BOARD
#error T_BOARD macro is not defined but we need it!
#error T_BOARD macro is not defined but we need it!
#endif
/obj/item/weapon/circuitboard/air_management
name = T_BOARD("atmosphere monitoring console")
build_path = /obj/machinery/computer/general_air_control
var/console_name
var/frequency = 1439
var/list/sensors = list()
var/list/sensor_information = list()
/obj/item/weapon/circuitboard/air_management/tank_control
name = T_BOARD("tank control")
build_path = /obj/machinery/computer/general_air_control/large_tank_control
frequency = 1441
var/input_tag
var/output_tag
var/list/input_info = list()
var/list/output_info = list()
var/input_flow_setting = 200
var/pressure_setting = ONE_ATMOSPHERE * 45
/obj/item/weapon/circuitboard/air_management/supermatter_core
name = T_BOARD("core control")
build_path = /obj/machinery/computer/general_air_control/supermatter_core
frequency = 1438
var/input_tag
var/output_tag
var/list/input_info = list()
var/list/output_info = list()
var/input_flow_setting = 700
var/pressure_setting = 100
/obj/item/weapon/circuitboard/air_management/injector_control
name = T_BOARD("injector control")
build_path = /obj/machinery/computer/general_air_control/fuel_injection
var/device_tag
var/list/device_info
var/automation = 0
var/cutoff_temperature = 2000
var/on_temperature = 1200
/************
* Construct *
************/
/obj/item/weapon/circuitboard/air_management/construct(var/obj/machinery/computer/general_air_control/C)
if (..(C))
C.frequency = frequency
if(console_name)
C.name = console_name
C.set_frequency(frequency)
C.sensors = sensors.Copy()
C.sensor_information = sensor_information.Copy()
return 1
/obj/item/weapon/circuitboard/air_management/tank_control/construct(var/obj/machinery/computer/general_air_control/large_tank_control/LTC)
if(..(LTC))
LTC.input_tag = input_tag
LTC.output_tag = output_tag
LTC.input_info = input_info.Copy()
LTC.output_info = output_info.Copy()
LTC.input_flow_setting = input_flow_setting
LTC.pressure_setting = pressure_setting
return 1
/obj/item/weapon/circuitboard/air_management/supermatter_core/construct(var/obj/machinery/computer/general_air_control/supermatter_core/SC)
if(..(SC))
SC.input_tag = input_tag
SC.output_tag = output_tag
SC.input_info = input_info.Copy()
SC.output_info = output_info.Copy()
SC.input_flow_setting = input_flow_setting
SC.pressure_setting = input_flow_setting
return 1
/obj/item/weapon/circuitboard/air_management/injector_control/construct(var/obj/machinery/computer/general_air_control/fuel_injection/FI)
if(..(FI))
FI.device_tag = device_tag
FI.device_info = device_info.Copy()
FI.automation = automation
FI.cutoff_temperature = cutoff_temperature
FI.on_temperature = on_temperature
return 1
/**************
* Deconstruct *
**************/
/obj/item/weapon/circuitboard/air_management/deconstruct(var/obj/machinery/computer/general_air_control/C)
if (..(C))
console_name = C.name
frequency = C.frequency
sensors = C.sensors.Copy()
sensor_information = C.sensor_information.Copy()
return 1
/obj/item/weapon/circuitboard/air_management/tank_control/deconstruct(var/obj/machinery/computer/general_air_control/large_tank_control/LTC)
if(..(LTC))
input_tag = LTC.input_tag
output_tag = LTC.output_tag
input_info = LTC.input_info.Copy()
output_info = LTC.output_info.Copy()
input_flow_setting = LTC.input_flow_setting
pressure_setting = LTC.pressure_setting
return 1
/obj/item/weapon/circuitboard/air_management/supermatter_core/deconstruct(var/obj/machinery/computer/general_air_control/supermatter_core/SC)
if(..(SC))
input_tag = SC.input_tag
output_tag = SC.output_tag
input_info = SC.input_info.Copy()
output_info = SC.output_info.Copy()
input_flow_setting = SC.input_flow_setting
pressure_setting = SC.input_flow_setting
return 1
/obj/item/weapon/circuitboard/air_management/injector_control/deconstruct(var/obj/machinery/computer/general_air_control/fuel_injection/FI)
if(..(FI))
device_tag = FI.device_tag
device_info = FI.device_info.Copy()
automation = FI.automation
cutoff_temperature = FI.cutoff_temperature
on_temperature = FI.on_temperature
return 1
code/modules/mob/living/silicon/robot/robot_modules.dm
+7 -6
View File
@@ -92,12 +92,13 @@ var/global/list/robot_modules = list(
/obj/item/weapon/robot_module/proc/respawn_consumable(var/mob/living/silicon/robot/R, var/rate)
var/obj/item/device/flash/F = locate() in src.modules
if(F.broken)
F.broken = 0
F.times_used = 0
F.icon_state = "flash"
else if(F.times_used)
F.times_used--
if(F)
if(F.broken)
F.broken = 0
F.times_used = 0
F.icon_state = "flash"
else if(F.times_used)
F.times_used--
if(!synths || !synths.len)
return
code/modules/power/lighting.dm
+5
View File
@@ -171,6 +171,11 @@
brightness_power = 2
brightness_color = "#da0205"
/obj/machinery/light/small/red
brightness_range = 5
brightness_power = 1
brightness_color = "#da0205"
/obj/machinery/light/spot
name = "spotlight"
fitting = "large tube"
html/changelog.html
+17 -4
View File
@@ -56,16 +56,29 @@
-->
<div class="commit sansserif">
<h2 class="date">02 November 2015</h2>
<h3 class="author">Hubblenaut updated:</h3>
<ul class="changes bgimages16">
<li class="rscadd">Adds tape for atmospherics.</li>
<li class="tweak">Tape graphics and algorithm changes. Looks a lot more appealing now.</li>
<li class="tweak">Starting and ending tape on the same turf will connect it to all surrounding walls/windows.</li>
<li class="tweak">Lifting a part of the tape will lift an entire tape section.</li>
<li class="tweak">Mobs on help intent do stop for tape.</li>
<li class="bugfix">Crumpled tape does not affect tape breaking behavior anymore.</li>
</ul>
<h2 class="date">27 October 2015</h2>
<h3 class="author">HarpyEagle updated:</h3>
<ul class="changes bgimages16">
<li class="bugfix">When affected by pepperspray, eye protection now prevents blindness and face protection now prevents stun, instead of face protection doing both.</li>
</ul>
<h2 class="date">21 October 2015</h2>
<h3 class="author">Hubblenaut updated:</h3>
<ul class="changes bgimages16">
<li class="tweak">Bruise packs are now applied per wound, not per limb.</li>
<li class="tweak">Bruise packs now use a delay depending on wound severity for applying.</li>
<li class="rscdel">Removed instant healing ability from advanced bruise packs and ointment.</li>
<h2 class="date">27 October 2015</h2>
<h3 class="author">HarpyEagle updated:</h3>
<ul class="changes bgimages16">
<li class="bugfix">When affected by pepperspray, eye protection now prevents blindness and face protection now prevents stun, instead of face protection doing both.</li>
</ul>
<h2 class="date">14 October 2015</h2>
html/changelogs/.all_changelog.yml
+9
View File
@@ -2356,3 +2356,12 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
HarpyEagle:
- bugfix: When affected by pepperspray, eye protection now prevents blindness and
face protection now prevents stun, instead of face protection doing both.
2015-11-02:
Hubblenaut:
- rscadd: Adds tape for atmospherics.
- tweak: Tape graphics and algorithm changes. Looks a lot more appealing now.
- tweak: Starting and ending tape on the same turf will connect it to all surrounding
walls/windows.
- tweak: Lifting a part of the tape will lift an entire tape section.
- tweak: Mobs on help intent do stop for tape.
- bugfix: Crumpled tape does not affect tape breaking behavior anymore.
html/changelogs/Hubblenaut-tape.yml
-41
View File
@@ -1,41 +0,0 @@
################################
# Example Changelog File
#
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
#
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
# When it is, any changes listed below will disappear.
#
# Valid Prefixes:
# bugfix
# wip (For works in progress)
# tweak
# soundadd
# sounddel
# rscadd (general adding of nice things)
# rscdel (general deleting of nice things)
# imageadd
# imagedel
# maptweak
# spellcheck (typo fixes)
# experiment
#################################
# Your name.
author: Hubblenaut
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True
# Any changes you've made. See valid prefix list above.
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
# SCREW THIS UP AND IT WON'T WORK.
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
changes:
- rscadd: "Adds tape for atmospherics."
- tweak: "Tape graphics and algorithm changes. Looks a lot more appealing now."
- tweak: "Starting and ending tape on the same turf will connect it to all surrounding walls/windows."
- tweak: "Lifting a part of the tape will lift an entire tape section."
- tweak: "Mobs on help intent do stop for tape."
- bugfix: "Crumpled tape does not affect tape breaking behavior anymore."
maps/exodus-1.dmm
+1361 -1373
View File
File diff suppressed because it is too large Load Diff