Skip to content

Commit

Permalink
Merge branch 'master' into bigred
Browse files Browse the repository at this point in the history
  • Loading branch information
spartanbobby committed Feb 23, 2024
2 parents 01df368 + d20b307 commit 36edf3d
Show file tree
Hide file tree
Showing 9 changed files with 47 additions and 44 deletions.
5 changes: 5 additions & 0 deletions code/game/objects/structures/reagent_dispensers.dm
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
icon_state = "watertank"
density = TRUE
anchored = FALSE
drag_delay = 1
health = 100 // Can be destroyed in 2-4 slashes.
flags_atom = CAN_BE_SYRINGED
wrenchable = TRUE
Expand Down Expand Up @@ -432,6 +433,7 @@
icon = 'icons/obj/objects.dmi'
icon_state = "peppertank"
anchored = TRUE
drag_delay = 3
wrenchable = FALSE
density = FALSE
amount_per_transfer_from_this = 45
Expand All @@ -445,6 +447,7 @@
icon_state = "water_cooler"
possible_transfer_amounts = null
anchored = TRUE
drag_delay = 3
chemical = "water"

/obj/structure/reagent_dispensers/water_cooler/walk_past
Expand All @@ -460,6 +463,7 @@
icon_state = "beertankTEMP"
amount_per_transfer_from_this = 10
chemical = "beer"
drag_delay = 3

/obj/structure/reagent_dispensers/beerkeg/alt
icon_state = "beertank_alt"
Expand All @@ -474,6 +478,7 @@
icon_state = "virusfoodtank"
amount_per_transfer_from_this = 10
anchored = TRUE
drag_delay = 3
wrenchable = FALSE
density = FALSE
chemical = "virusfood"
Expand Down
4 changes: 0 additions & 4 deletions html/changelogs/AutoChangeLog-pr-5165.yml

This file was deleted.

16 changes: 0 additions & 16 deletions html/changelogs/AutoChangeLog-pr-5432.yml

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

42 changes: 42 additions & 0 deletions html/changelogs/archive/2024-02.yml
Original file line number Diff line number Diff line change
Expand Up @@ -304,3 +304,45 @@
- rscadd: CIC can now view helmet cameras of Command Staff. Literally 1984
iloveloopers:
- qol: Autolathes are now significantly faster.
2024-02-23:
AtticusRezzer:
- bugfix: Fixed the incorrect area flag in lifeboats allowing tunneling
Drathek:
- balance: Increased same tile weed expansion delay for queen from 7s to 10s
Huffie56:
- maptweak: split each Hallway area port and starboard into three areas.(fore midship
aft)
- maptweak: change the area around north and south west staircase to remove emergency
shutters.
- maptweak: change the area west of squad preparation room to remove emergency shutter.
- maptweak: change the area west of lower engi to make emergency shutter be at the
frontier of the area.
InsaneRed:
- rscadd: Added a new ability to the predalien "Feral Rush" that increases it's
armor and speed for a short duration.
- rscadd: Added two new abilities to the predalien "Feral Frenzy" and a toggle.
The predalien can now switch between a single target GUT and an AOE one, both
of which has damage that scale with your kills.
- rscdel: Removed the predaliens gib ability
- rscdel: Removed the predaliens "pounce" ability
- rscdel: Removed the predaliens "Ground Smash" ability
- balance: Predalien no longer has plasma costs, or plasma.
- balance: The Plasma Rifle, which is ONLY used to hunt abominations now has a higher
ROF and has incin bullets.
- spellcheck: Re-wrote the predalien text to be more up to date and remove missinformation
- qol: Everyone can see how many kills the predalien has by examining it.
- rscadd: Added a "Feral Smash" ability that lets you grab somebody and smash them
to the ground, this scales with kills and is a devastating attack.
- balance: Removed screenshake from predalien's screech
- balance: Predalien removes fire stacks faster.
- bugfix: Girders are now slashable by very_sharp_claws instead of just having a
queen chack
SabreML:
- bugfix: Fixed the search function of TGUI input lists.
- qol: Made the TGUI input list search bar automatically focus when toggled.
- bugfix: Fixed Xenomorphs not having their caste's tackle duration values applied
to them.
fira:
- code_imp: Updated mapping backend from /tg/ upstream.
iloveloopers:
- qol: Reagent tanks can now be dragged faster.

0 comments on commit 36edf3d

Please sign in to comment.