cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-30 00:21:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adhomai PRA Away Sites Fixes (#19215)

Browse Source 
PSIS Base and Nuclear Waste site turrets now updated to not shoot PRA
roles (access was not set properly)

Co-authored-by: Ben10083 <Ben10083@users.noreply.github.com>
This commit is contained in:
Ben
2024-05-22 17:25:57 +00:00
committed by GitHub
co-authored by Ben10083
parent d0c79410a3
commit 0ec4b047e4
3 changed files with 117 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
html/changelogs/Ben10083 - PRA_Bases.yml
+58
View File
@@ -0,0 +1,58 @@
################################
# 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
# - (fixes bugs)
# wip
# - (work in progress)
# qol
# - (quality of life)
# soundadd
# - (adds a sound)
# sounddel
# - (removes a sound)
# rscadd
# - (adds a feature)
# rscdel
# - (removes a feature)
# imageadd
# - (adds an image or sprite)
# imagedel
# - (removes an image or sprite)
# spellcheck
# - (fixes spelling or grammar)
# experiment
# - (experimental change)
# balance
# - (balance changes)
# code_imp
# - (misc internal code change)
# refactor
# - (refactors code)
# config
# - (makes a change to the config files)
# admin
# - (makes changes to administrator tools)
# server
# - (miscellaneous changes to server)
#################################
# Your name.
author: Ben10083
# 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, this gets changed to [] after reading. Just remove the brackets when you add new shit.
# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
changes:
- bugfix: "PSIS and Nuclear Waste Turrets Fixed to not fire upon Loyal PRA Citizens (Only if they are Hadiist Supporters)."
maps/random_ruins/exoplanets/adhomai/adhomai_nuclear_waste.dmm
+22 -21
View File
@@ -39,12 +39,14 @@
},
/area/adhomai_nuclear_waste)
"g" = (
/obj/machinery/porta_turret/ballistic,
/obj/effect/floor_decal/industrial/warning/full,
/obj/machinery/light{
dir = 4;
status = 2
},
/obj/machinery/porta_turret/ballistic{
req_one_access = list(209)
},
/turf/simulated/floor/tiled/rust{
temperature = 268.15
},
@@ -105,11 +107,13 @@
/turf/simulated/floor/exoplanet/snow/cold,
/area/adhomai_nuclear_waste)
"t" = (
/obj/machinery/porta_turret/ballistic,
/obj/effect/floor_decal/industrial/warning/full,
/obj/machinery/light{
dir = 8
},
/obj/machinery/porta_turret/ballistic{
req_one_access = list(209)
},
/turf/simulated/floor/tiled/rust{
temperature = 268.15
},
@@ -137,7 +141,9 @@
/area/adhomai_nuclear_waste)
"B" = (
/obj/effect/floor_decal/industrial/warning/full,
/obj/machinery/porta_turret/ballistic,
/obj/machinery/porta_turret/ballistic{
req_one_access = list(209)
},
/turf/simulated/floor/tiled/rust{
temperature = 268.15
},
@@ -200,18 +206,13 @@
},
/turf/simulated/floor/exoplanet/snow/cold,
/area/adhomai_nuclear_waste)
"S" = (
/obj/machinery/porta_turret/ballistic,
/obj/effect/floor_decal/industrial/warning/full,
/turf/simulated/floor/tiled/rust{
temperature = 268.15
},
/area/adhomai_nuclear_waste)
"T" = (
/obj/machinery/turretid/lethal{
pixel_y = -32;
req_access = list(209);
dir = 1
dir = 1;
check_arrest = 0;
check_records = 0
},
/obj/machinery/button/remote/blast_door{
id = "radiation_waste";
@@ -440,12 +441,12 @@ J
J
J
J
S
B
I
I
I
I
S
B
J
J
J
@@ -536,12 +537,12 @@ J
J
I
I
S
B
I
M
e
I
S
B
I
I
J
@@ -660,7 +661,7 @@ J
B
I
I
S
B
I
e
M
@@ -788,7 +789,7 @@ G
B
I
I
S
B
I
e
M
@@ -920,12 +921,12 @@ J
J
I
I
S
B
I
e
M
I
S
B
I
I
J
@@ -1016,12 +1017,12 @@ J
J
J
J
S
B
I
I
I
I
S
B
J
J
J
maps/random_ruins/exoplanets/adhomai/psis_outpost.dmm
+37 -9
View File
@@ -34,7 +34,9 @@
},
/obj/machinery/turretid/lethal{
pixel_y = 32;
req_access = list(209)
req_access = list(209);
check_arrest = 0;
check_records = 0
},
/mob/living/simple_animal/hostile/commanded/dog/harron/cybernetic,
/turf/simulated/floor/tiled/dark{
@@ -42,7 +44,9 @@
},
/area/psis_outpost)
"dd" = (
/obj/machinery/porta_turret/ballistic,
/obj/machinery/porta_turret/ballistic{
req_one_access = list(209)
},
/obj/effect/floor_decal/industrial/warning/full,
/obj/machinery/light,
/turf/simulated/floor/tiled/dark{
@@ -231,13 +235,16 @@
pixel_y = 5;
pixel_x = 8
},
/obj/item/storage/box/syndie_kit/spy/hidden,
/turf/simulated/floor/tiled/dark{
temperature = 268.15
},
/area/psis_outpost)
"lf" = (
/obj/machinery/porta_turret/ballistic,
/obj/effect/floor_decal/industrial/warning/full,
/obj/machinery/porta_turret/ballistic{
req_one_access = list(209)
},
/turf/simulated/floor/tiled/dark{
temperature = 268.15
},
@@ -391,6 +398,16 @@
temperature = 268.15
},
/area/psis_outpost)
"vc" = (
/obj/effect/floor_decal/industrial/warning/full,
/obj/machinery/light,
/obj/machinery/porta_turret/ballistic{
req_one_access = list(209)
},
/turf/simulated/floor/tiled/dark{
temperature = 268.15
},
/area/psis_outpost)
"vd" = (
/obj/effect/floor_decal/corner/black{
dir = 6
@@ -443,6 +460,13 @@
temperature = 268.15
},
/area/psis_outpost)
"An" = (
/obj/machinery/turretid/lethal{
pixel_y = 32;
req_access = list(209)
},
/turf/simulated/wall/r_wall,
/area/psis_outpost)
"Bh" = (
/obj/structure/filingcabinet/chestdrawer,
/obj/effect/floor_decal/corner/red{
@@ -666,9 +690,9 @@
/obj/structure/closet/crate,
/obj/item/storage/box/folders,
/obj/item/storage/box/folders,
/obj/item/storage/field_ration,
/obj/item/storage/field_ration,
/obj/item/storage/field_ration,
/obj/item/storage/field_ration/army,
/obj/item/storage/field_ration/army,
/obj/item/storage/field_ration/army,
/obj/item/storage/field_ration,
/obj/item/storage/field_ration,
/obj/item/storage/field_ration,
@@ -1030,12 +1054,16 @@
/obj/item/gun/projectile/shotgun/pump/rifle,
/obj/item/gun/projectile/shotgun/pump/rifle,
/obj/item/gun/projectile/automatic/tommygun,
/obj/item/ammo_magazine/submachinedrum,
/obj/structure/sign/painting_frame/hadii{
pixel_y = 32
},
/obj/item/gun/energy/rifle/icelance,
/obj/item/ammo_magazine/submachinedrum,
/obj/item/gun/energy/pistol,
/obj/item/gun/projectile/automatic/tommygun,
/obj/item/ammo_magazine/submachinedrum,
/obj/item/ammo_magazine/submachinedrum,
/obj/item/ammo_magazine/submachinedrum,
/turf/simulated/floor/tiled/dark{
temperature = 268.15
},
@@ -1508,7 +1536,7 @@ Mq
Mq
Mq
Mq
Mq
An
Mq
jx
Kl
@@ -1665,7 +1693,7 @@ Mq
lf
Hc
Tn
dd
vc
Mq
Ke
Tn