cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-26 01:52:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Emergency Shield Projector Buff (#7422)

Browse Source
This commit is contained in:
Joshie
2019-11-20 04:27:21 +11:00
committed by Werner
parent 6e0ae31f9b
commit 39c4428b7f
5 changed files with 125 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/shieldgen/emergency_shield.dm
View File

@@ -10,8 +10,8 @@
atmos_canpass = CANPASS_NEVER
var/const/max_health = 200
var/health = max_health //The shield can only take so much beating (prevents perma-prisons)
var/shield_generate_power = 7500 //how much power we use when regenerating
var/shield_idle_power = 1500 //how much power we use when just being sustained.
var/shield_generate_power = 2500 //how much power we use when regenerating
var/shield_idle_power = 500 //how much power we use when just being sustained.
/obj/machinery/shield/malfai
name = "emergency forcefield"

43
html/changelogs/furrycactus - emergency shields.yml Normal file
View File

@@ -0,0 +1,43 @@
################################
# 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
# balance
# admin
# backend
# security
# refactor
#################################
# Your name.
author: Furrycactus
# 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:
- maptweak: "Added two more Emergency Shield Projectors to Engineering Hard Storage, added four to Atmospherics, and two in the shield control room."
- tweak: "Reduced the power draw of Emergency Shield Projectors to more reasonable levels, so two don't max out an entire substation."

99
maps/aurora/aurora-3_sublevel.dmm
View File

@@ -23817,35 +23817,6 @@
},
/turf/simulated/floor/plating,
/area/maintenance/scisublevel)
"bbc" = (
/obj/machinery/door/firedoor,
/obj/structure/grille,
/obj/structure/window/reinforced{
icon_state = "rwindow";
dir = 1
},
/obj/structure/window/reinforced{
dir = 4
},
/obj/structure/window/reinforced{
icon_state = "rwindow";
dir = 8
},
/turf/simulated/floor/plating,
/area/engineering/atmos)
"bbd" = (
/obj/machinery/door/firedoor,
/obj/structure/grille,
/obj/structure/window/reinforced,
/obj/structure/window/reinforced{
dir = 4
},
/obj/structure/window/reinforced{
icon_state = "rwindow";
dir = 8
},
/turf/simulated/floor/plating,
/area/engineering/atmos)
"bbe" = (
/obj/machinery/light/small/emergency{
icon_state = "bulb1";
@@ -28697,6 +28668,18 @@
/obj/structure/cable/cyan,
/turf/simulated/floor/plating,
/area/outpost/engineering/power)
"fKe" = (
/obj/machinery/door/firedoor,
/obj/structure/grille,
/obj/structure/window/reinforced{
dir = 4
},
/obj/structure/window/reinforced{
icon_state = "rwindow";
dir = 8
},
/turf/simulated/floor/plating,
/area/mine/unexplored)
"fOV" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 8
@@ -33322,6 +33305,19 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/patient_wing_gym)
"qMB" = (
/obj/machinery/door/firedoor,
/obj/structure/grille,
/obj/structure/window/reinforced,
/obj/structure/window/reinforced{
dir = 4
},
/obj/structure/window/reinforced{
icon_state = "rwindow";
dir = 8
},
/turf/simulated/floor/plating,
/area/mine/unexplored)
"qMQ" = (
/obj/structure/cable{
d1 = 4;
@@ -34120,6 +34116,11 @@
},
/turf/simulated/floor/tiled,
/area/outpost/engineering/hallway)
"svn" = (
/obj/effect/floor_decal/industrial/outline/yellow,
/obj/machinery/shieldgen,
/turf/simulated/floor/plating,
/area/engineering/atmos)
"swb" = (
/obj/structure/table/glass,
/turf/simulated/floor/tiled/dark,
@@ -35366,6 +35367,22 @@
},
/turf/simulated/open,
/area/maintenance/engsublevel)
"veq" = (
/obj/machinery/door/firedoor,
/obj/structure/grille,
/obj/structure/window/reinforced{
icon_state = "rwindow";
dir = 1
},
/obj/structure/window/reinforced{
dir = 4
},
/obj/structure/window/reinforced{
icon_state = "rwindow";
dir = 8
},
/turf/simulated/floor/plating,
/area/mine/unexplored)
"vgD" = (
/turf/simulated/floor/tiled/white,
/area/rnd/xenobiology/xenoflora_hazard)
@@ -57218,11 +57235,11 @@ aeQ
aaO
aaO
aaO
aba
aba
aba
aba
aba
akG
akG
veq
fKe
qMB
aaO
aaO
aaO
@@ -57474,12 +57491,12 @@ aej
aeR
afv
aeY
abo
aaO
aaO
aaO
bbc
aei
bbd
svn
svn
svn
svn
aaO
aaO
vqy
@@ -63642,7 +63659,7 @@ aes
adF
abo
abo
aaO
abo
aaO
aaa
aaa
@@ -63900,7 +63917,7 @@ aeQ
aaO
aaO
aaO
aaa
akG
aaa
aaa
aaa

28
maps/aurora/aurora-4_mainlevel.dmm
View File

@@ -6943,6 +6943,7 @@
/area/engineering/storage_hard)
"anG" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/shieldgen,
/turf/simulated/floor/plating,
/area/engineering/storage_hard)
"anH" = (
@@ -8265,17 +8266,17 @@
/turf/simulated/floor/plating,
/area/engineering/storage_hard)
"apZ" = (
/obj/machinery/shieldgen,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/machinery/shieldwallgen,
/turf/simulated/floor/plating,
/area/engineering/storage_hard)
"aqa" = (
/obj/machinery/shieldwallgen,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 9
},
/obj/machinery/shieldgen,
/turf/simulated/floor/plating,
/area/engineering/storage_hard)
"aqb" = (
@@ -8986,15 +8987,15 @@
/turf/simulated/floor/plating,
/area/engineering/storage_hard)
"arm" = (
/obj/machinery/shieldgen,
/obj/machinery/light_switch{
pixel_x = 6;
pixel_y = -28
},
/obj/machinery/shieldwallgen,
/turf/simulated/floor/plating,
/area/engineering/storage_hard)
"arn" = (
/obj/machinery/shieldwallgen,
/obj/machinery/shieldgen,
/turf/simulated/floor/plating,
/area/engineering/storage_hard)
"aro" = (
@@ -30702,11 +30703,11 @@
"bbp" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock{
name = "Custodial Closet";
req_access = list(26)
},
/obj/machinery/door/firedoor,
/turf/simulated/floor/tiled/dark,
/area/janitor)
"bbq" = (
@@ -66445,6 +66446,12 @@
/obj/random/junk,
/turf/simulated/floor/plating,
/area/maintenance/engineering)
"mpm" = (
/obj/machinery/power/singularity_beacon/emergency{
name = "emergency tesla beacon"
},
/turf/simulated/floor/plating,
/area/engineering/storage_hard)
"mqp" = (
/obj/machinery/atmospherics/pipe/manifold4w/hidden,
/obj/effect/decal/cleanable/dirt,
@@ -68063,13 +68070,6 @@
"ral" = (
/turf/simulated/wall,
/area/assembly/chargebay)
"rbC" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/power/singularity_beacon/emergency{
name = "emergency tesla beacon"
},
/turf/simulated/floor/plating,
/area/engineering/storage_hard)
"rcu" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -87387,7 +87387,7 @@ akz
akz
amv
anE
anE
mpm
apZ
arm
ajL
@@ -87644,7 +87644,7 @@ akA
akA
amw
anG
rbC
anG
aqa
arn
ajL

11
maps/aurora/aurora-6_surface.dmm
View File

@@ -8982,6 +8982,11 @@
"rv" = (
/turf/simulated/open,
/area/turbolift/main_arrivals_aux)
"rw" = (
/obj/effect/floor_decal/industrial/outline/yellow,
/obj/machinery/shieldwallgen,
/turf/simulated/floor/plating,
/area/storage/tools)
"rx" = (
/turf/simulated/wall/shuttle,
/area/shuttle/escape_pod1/station)
@@ -14388,8 +14393,8 @@
/turf/simulated/floor/tiled/freezer,
/area/crew_quarters/toilet)
"CB" = (
/obj/machinery/shieldwallgen,
/obj/effect/floor_decal/industrial/outline/yellow,
/obj/machinery/shieldgen,
/turf/simulated/floor/plating,
/area/storage/shields)
"CC" = (
@@ -52500,8 +52505,8 @@ Wi
WK
WN
ZV
Wa
Wa
rw
rw
AZ
OG
sU