mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-28 15:39:57 +01:00
Merc tweaks (#14500)
This commit is contained in:
TheDanseMacabre
@@ -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: TheDanseMacabre
|
||||
|
||||
# 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: "Minor changes to the Sol equipment locker at the mercenary base."
|
||||
- tweak: "The nuclear bomb no longer spawns on the mercenary shuttle. It now spawns in the base itself."
|
||||
- rscdel: "Mercenaries no longer get 3 maxcap TTVs for free."
|
||||
@@ -7718,9 +7718,9 @@
|
||||
/obj/machinery/button/remote/blast_door{
|
||||
id = "merchant_airlock";
|
||||
name = "external airlock shutter";
|
||||
pixel_x = -7;
|
||||
pixel_y = 35;
|
||||
req_access = null;
|
||||
pixel_x = -7
|
||||
req_access = null
|
||||
},
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/shuttle/merchant)
|
||||
@@ -7828,16 +7828,16 @@
|
||||
/obj/machinery/button/remote/blast_door{
|
||||
id = "merchant_windows";
|
||||
name = "viewing shutters";
|
||||
pixel_x = -7;
|
||||
pixel_y = 25;
|
||||
req_access = null;
|
||||
pixel_x = -7
|
||||
req_access = null
|
||||
},
|
||||
/obj/machinery/button/remote/blast_door{
|
||||
id = "merchant_airlock";
|
||||
name = "external airlock shutter";
|
||||
pixel_x = -7;
|
||||
pixel_y = 35;
|
||||
req_access = null;
|
||||
pixel_x = -7
|
||||
req_access = null
|
||||
},
|
||||
/turf/simulated/floor/wood,
|
||||
/area/shuttle/merchant)
|
||||
@@ -8592,10 +8592,10 @@
|
||||
/obj/structure/table/reinforced,
|
||||
/obj/machinery/button/remote/blast_door{
|
||||
dir = 4;
|
||||
pixel_y = -1;
|
||||
pixel_x = -6;
|
||||
id = "merchant_bridge";
|
||||
name = "bridge window shutters";
|
||||
id = "merchant_bridge"
|
||||
pixel_x = -6;
|
||||
pixel_y = -1
|
||||
},
|
||||
/turf/simulated/floor/carpet/blue,
|
||||
/area/shuttle/merchant)
|
||||
@@ -9093,9 +9093,9 @@
|
||||
/obj/structure/grille,
|
||||
/obj/machinery/door/firedoor,
|
||||
/obj/machinery/door/blast/shutters/open{
|
||||
dir = 8;
|
||||
id = "merchant_bridge";
|
||||
name = "viewing shutter";
|
||||
dir = 8
|
||||
name = "viewing shutter"
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/area/shuttle/merchant)
|
||||
@@ -11000,9 +11000,9 @@
|
||||
/obj/structure/grille,
|
||||
/obj/machinery/door/firedoor,
|
||||
/obj/machinery/door/blast/shutters/open{
|
||||
dir = 2;
|
||||
id = "merchant_bridge";
|
||||
name = "viewing shutter";
|
||||
dir = 2
|
||||
name = "viewing shutter"
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/area/shuttle/merchant)
|
||||
@@ -24104,9 +24104,9 @@
|
||||
dir = 1;
|
||||
icon_state = "tube1"
|
||||
},
|
||||
/obj/structure/table/standard,
|
||||
/obj/item/paper_bin,
|
||||
/obj/item/pen,
|
||||
/obj/effect/landmark{
|
||||
name = "Nuclear-Bomb"
|
||||
},
|
||||
/turf/unsimulated/floor{
|
||||
icon_state = "wood_light"
|
||||
},
|
||||
@@ -31351,9 +31351,6 @@
|
||||
"buz" = (
|
||||
/obj/effect/floor_decal/industrial/outline/yellow,
|
||||
/obj/structure/closet/crate/drop,
|
||||
/obj/effect/spawner/newbomb/timer/syndicate,
|
||||
/obj/effect/spawner/newbomb/timer/syndicate,
|
||||
/obj/effect/spawner/newbomb/timer/syndicate,
|
||||
/turf/simulated/floor/reinforced,
|
||||
/area/shuttle/mercenary)
|
||||
"buA" = (
|
||||
@@ -31454,14 +31451,6 @@
|
||||
/obj/item/clothing/under/rank/sol/marine,
|
||||
/obj/item/clothing/under/rank/sol/marine,
|
||||
/obj/item/clothing/under/rank/sol/marine,
|
||||
/obj/item/clothing/suit/storage/vest/sol,
|
||||
/obj/item/clothing/suit/storage/vest/sol,
|
||||
/obj/item/clothing/suit/storage/vest/sol,
|
||||
/obj/item/clothing/suit/storage/vest/sol,
|
||||
/obj/item/clothing/head/helmet/sol,
|
||||
/obj/item/clothing/head/helmet/sol,
|
||||
/obj/item/clothing/head/helmet/sol,
|
||||
/obj/item/clothing/head/helmet/sol,
|
||||
/obj/item/clothing/head/sol,
|
||||
/obj/item/clothing/head/sol,
|
||||
/obj/item/clothing/head/sol,
|
||||
@@ -31469,9 +31458,38 @@
|
||||
/obj/item/clothing/head/sol/marine,
|
||||
/obj/item/clothing/head/sol/marine,
|
||||
/obj/item/clothing/head/sol/marine,
|
||||
/obj/item/clothing/head/sol/garrison,
|
||||
/obj/item/clothing/head/sol/dress/admiral,
|
||||
/obj/item/clothing/head/sol/marine,
|
||||
/obj/effect/floor_decal/industrial/outline/yellow,
|
||||
/obj/item/clothing/head/helmet/military,
|
||||
/obj/item/clothing/head/helmet/military,
|
||||
/obj/item/clothing/head/helmet/military,
|
||||
/obj/item/clothing/head/helmet/military,
|
||||
/obj/item/clothing/accessory/leg_guard/military,
|
||||
/obj/item/clothing/accessory/leg_guard/military,
|
||||
/obj/item/clothing/accessory/leg_guard/military,
|
||||
/obj/item/clothing/accessory/leg_guard/military,
|
||||
/obj/item/clothing/accessory/arm_guard/military,
|
||||
/obj/item/clothing/accessory/arm_guard/military,
|
||||
/obj/item/clothing/accessory/arm_guard/military,
|
||||
/obj/item/clothing/accessory/arm_guard/military,
|
||||
/obj/item/clothing/suit/armor/carrier/military,
|
||||
/obj/item/clothing/suit/armor/carrier/military,
|
||||
/obj/item/clothing/suit/armor/carrier/military,
|
||||
/obj/item/clothing/suit/armor/carrier/military,
|
||||
/obj/item/clothing/under/rank/sol/army,
|
||||
/obj/item/clothing/under/rank/sol/army,
|
||||
/obj/item/clothing/under/rank/sol/army,
|
||||
/obj/item/clothing/under/rank/sol/army,
|
||||
/obj/item/clothing/under/rank/sol/dress/subofficer,
|
||||
/obj/item/clothing/under/rank/sol/dress/officer,
|
||||
/obj/item/clothing/under/rank/sol/dress/admiral,
|
||||
/obj/item/clothing/head/sol/dress/marine,
|
||||
/obj/item/clothing/head/sol/dress/officer,
|
||||
/obj/item/clothing/head/sol/dress/admiral,
|
||||
/obj/item/clothing/under/rank/sol,
|
||||
/obj/item/clothing/under/rank/sol,
|
||||
/obj/item/clothing/under/rank/sol,
|
||||
/obj/item/clothing/under/rank/sol,
|
||||
/turf/unsimulated/floor{
|
||||
icon_state = "new_reinforced"
|
||||
},
|
||||
@@ -36609,9 +36627,9 @@
|
||||
/obj/structure/window/shuttle/scc_space_ship,
|
||||
/obj/machinery/door/firedoor,
|
||||
/obj/machinery/door/blast/shutters/open{
|
||||
dir = 2;
|
||||
id = "merchant_bridge";
|
||||
name = "viewing shutter";
|
||||
dir = 2
|
||||
name = "viewing shutter"
|
||||
},
|
||||
/obj/structure/grille/diagonal{
|
||||
dir = 1
|
||||
@@ -36979,9 +36997,9 @@
|
||||
/obj/structure/window/shuttle/scc_space_ship,
|
||||
/obj/machinery/door/firedoor,
|
||||
/obj/machinery/door/blast/shutters/open{
|
||||
dir = 2;
|
||||
id = "merchant_bridge";
|
||||
name = "viewing shutter";
|
||||
dir = 2
|
||||
name = "viewing shutter"
|
||||
},
|
||||
/obj/structure/grille/diagonal{
|
||||
dir = 4
|
||||
|
||||
Reference in New Issue
Block a user