Skip to content

Commit

Permalink
Merge branch 'master' into tgui-microwave
Browse files Browse the repository at this point in the history
  • Loading branch information
Crowbar764 committed Sep 27, 2023
2 parents 935ae59 + da8b9e9 commit 1d5bf3e
Show file tree
Hide file tree
Showing 24 changed files with 246 additions and 156 deletions.
4 changes: 0 additions & 4 deletions html/changelogs/AutoChangeLog-pr-4222.yml

This file was deleted.

11 changes: 0 additions & 11 deletions html/changelogs/AutoChangeLog-pr-4320.yml

This file was deleted.

6 changes: 0 additions & 6 deletions html/changelogs/AutoChangeLog-pr-4380.yml

This file was deleted.

5 changes: 0 additions & 5 deletions html/changelogs/AutoChangeLog-pr-4411.yml

This file was deleted.

5 changes: 0 additions & 5 deletions html/changelogs/AutoChangeLog-pr-4418.yml

This file was deleted.

7 changes: 0 additions & 7 deletions html/changelogs/AutoChangeLog-pr-4456.yml

This file was deleted.

4 changes: 0 additions & 4 deletions html/changelogs/AutoChangeLog-pr-4458.yml

This file was deleted.

5 changes: 0 additions & 5 deletions html/changelogs/AutoChangeLog-pr-4461.yml

This file was deleted.

7 changes: 0 additions & 7 deletions html/changelogs/AutoChangeLog-pr-4463.yml

This file was deleted.

4 changes: 0 additions & 4 deletions html/changelogs/AutoChangeLog-pr-4465.yml

This file was deleted.

4 changes: 0 additions & 4 deletions html/changelogs/AutoChangeLog-pr-4487.yml

This file was deleted.

4 changes: 0 additions & 4 deletions html/changelogs/AutoChangeLog-pr-4488.yml

This file was deleted.

4 changes: 0 additions & 4 deletions html/changelogs/AutoChangeLog-pr-4489.yml

This file was deleted.

4 changes: 0 additions & 4 deletions html/changelogs/AutoChangeLog-pr-4490.yml

This file was deleted.

4 changes: 0 additions & 4 deletions html/changelogs/AutoChangeLog-pr-4491.yml

This file was deleted.

4 changes: 0 additions & 4 deletions html/changelogs/AutoChangeLog-pr-4503.yml

This file was deleted.

4 changes: 0 additions & 4 deletions html/changelogs/AutoChangeLog-pr-4508.yml

This file was deleted.

4 changes: 0 additions & 4 deletions html/changelogs/AutoChangeLog-pr-4509.yml

This file was deleted.

62 changes: 62 additions & 0 deletions html/changelogs/archive/2023-09.yml
Original file line number Diff line number Diff line change
Expand Up @@ -333,3 +333,65 @@
weedable now.
- maptweak: LV Comms now always spawn in Tcomms and one either on the east or west
river
2023-09-27:
CapCamIII:
- rscadd: Adds upp presets for the unused officer ranks, Kapitan, Lt Kolonel, MajGen,
LtGen, Gen, for use in admin events
- rscadd: Changes UPP conscript rank from weird conscript only rank to Private,
moves UPP soldier to PFC, removing the rank gap between soldier and support
- code_imp: Cleans up UPP rank code by deleting redundant ranks
CapCamIII, AmoryBlaine:
- rscadd: Adds new service uniform sprite that is standard across maps, sprites
by AmoryBlaine
- rscadd: Resprites old dress uniform, renames it, adds to XO vendor as a uniform
choice as it fits there now, sprites by AmoryBlaine
- rscadd: Adds new uniform, command boiler suit like gorman wears in the movie,
available in SO locker, SO vendor, XO vendor, CO vendor, sprites by AmoryBlaine
- rscadd: Adds new brown versions of gloves and boot to custom loadout, also lowers
the price of jungle boots to two, sprites by AmoryBlaine
- rscadd: Seperates officer cap and RO cap, officers get officer cap, QM gets RO
cap, CTs get req cap, sprites once again by AmoryBlaine
- rscadd: UPP boots and gloves use the new brown sprite, as it fits their color
scheme and looks cool.
- bugfix: Freelancer leader now spawns with a knife in their boots
- imageadd: Resprites patrol cap, officer cap, SEA cap, standard black boot, standard
black glove, and formal gloves, sprites by AmoryBlaine
Casper:
- bugfix: fixed reagent canister being deleted if ejected with your hands full
- bugfix: fixed cigarette punctuation error
Drathek:
- bugfix: Fix dead huggers converting to non-player huggers
Git-Nivrak:
- bugfix: Fixes no fire delay on m56d in semi-auto and burst fire
HeresKozmos:
- mapadd: added 9 new tunnels to trijent dam
- mapadd: added 9 new tunnels to Fiorina SciAnnex
Morrow:
- bugfix: Fixed a bug with akimbo firing
- rscdel: Removed alpha egg on LV522
- rscadd: Added a save-able preference for auto-observe
- bugfix: Fixed numerous problems with HUD observer mode
- code_imp: Created a wrapper for client screen changes
- code_imp: Made check contents less horrendous
Steelpoint:
- mapadd: Sensor Towers have been added to all maps.
- rscadd: UPP survivor radio role identifiers now have a shorter title.
- rscadd: UPP survivors now default to using a players preferred name instead of
a random UPP name.
TeDGamer:
- balance: All trained+ engineer skill levels affect duration now.
- balance: Removed double skill duration multiplier for m56d's.
TheGamerdk:
- bugfix: Adding marines to intel squad broke the crew manifest
Zonespace27:
- bugfix: HEFA Knights now spawn with their armor again
- balance: HEFA Knights now spawn with 2 HEFA in their helmets
- admin: Added skillless subtype of the m707
- balance: Lowered vulture spotted/unspotted drift from 33/100 to 25/90
- balance: Lowered vulture scope adjust/move time from 0.5/1.0s to 0.4/0.8s
- balance: Vulture bipod anchors user in place
bostonthebear:
- rscadd: Changes pilot officer timelock from 5 hours as squad marine to 2 hours
as DCC
realforest2001:
- balance: Adds an extra 75% damage and hive interference to plasma rifle vs xenos.
46 changes: 30 additions & 16 deletions maps/map_files/BigRed/BigRed.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -16567,17 +16567,17 @@
dir = 6
},
/turf/open/floor{
dir = 4;
icon_state = "asteroidwarning"
dir = 1;
icon_state = "asteroidfloor"
},
/area/bigredv2/caves_lambda)
"aTB" = (
/obj/structure/pipes/vents/pump{
dir = 8
},
/turf/open/floor{
dir = 4;
icon_state = "asteroidwarning"
dir = 1;
icon_state = "asteroidfloor"
},
/area/bigredv2/caves_lambda)
"aTC" = (
Expand Down Expand Up @@ -16945,14 +16945,12 @@
dir = 9
},
/turf/open/floor{
dir = 6;
icon_state = "asteroidwarning"
},
/area/bigredv2/caves_lambda)
"aUC" = (
/obj/effect/decal/remains/human,
/turf/open/floor{
dir = 6;
icon_state = "asteroidwarning"
},
/area/bigredv2/caves_lambda)
Expand Down Expand Up @@ -29578,6 +29576,13 @@
icon_state = "darkblue2"
},
/area/bigredv2/caves/eta/research)
"gXh" = (
/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
/turf/open/floor{
dir = 1;
icon_state = "asteroidwarning"
},
/area/bigredv2/caves_lambda)
"gXp" = (
/turf/open/mars_cave{
icon_state = "mars_cave_6"
Expand Down Expand Up @@ -30885,6 +30890,15 @@
icon_state = "mars_cave_2"
},
/area/bigredv2/caves_sw)
"jNO" = (
/obj/structure/machinery/sensortower{
pixel_x = -9
},
/turf/open/floor{
dir = 1;
icon_state = "asteroidfloor"
},
/area/bigredv2/caves_lambda)
"jOc" = (
/obj/structure/machinery/door/poddoor/almayer/closed{
dir = 4;
Expand Down Expand Up @@ -77158,7 +77172,7 @@ aOn
aOn
aOn
aOn
aOn
aTv
aTA
aUB
wQC
Expand Down Expand Up @@ -77375,7 +77389,7 @@ gXp
gXp
gXp
gXp
aSm
aTw
aTB
aUC
wQC
Expand Down Expand Up @@ -77592,9 +77606,9 @@ tQw
ahw
tQw
tQw
aSn
gXp
gXp
gXh
aTv
aMT
tQw
tQw
pIN
Expand Down Expand Up @@ -77809,9 +77823,9 @@ tQw
tQw
xFZ
xFZ
xFZ
tQw
tQw
aSm
jNO
aMT
tQw
xFZ
ahy
Expand Down Expand Up @@ -78027,8 +78041,8 @@ eFh
aao
aao
aao
gmN
xFZ
aSm
aMV
sNQ
aao
aao
Expand Down
Loading

0 comments on commit 1d5bf3e

Please sign in to comment.