Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Infinite stomach #21

Draft
wants to merge 6 commits into
base: campaign
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions code/datums/ammo/bullet/special_ammo.dm
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,9 @@
icon_state = "bullet" // Keeping it bog standard with the turret but allows it to be changed

accurate_range = 12
damage = 40
damage = 35
penetration= ARMOR_PENETRATION_TIER_10 //Bumped the penetration to serve a different role from sentries, MGs are a bit more offensive
accuracy = HIT_ACCURACY_TIER_5
accuracy = HIT_ACCURACY_TIER_3

/datum/ammo/bullet/machinegun/set_bullet_traits()
. = ..()
Expand Down
2 changes: 1 addition & 1 deletion code/modules/cm_marines/smartgun_mount.dm
Original file line number Diff line number Diff line change
Expand Up @@ -471,7 +471,7 @@
GUN_FIREMODE_AUTOMATIC,
)
/// A multiplier for how slow this gun should fire in automatic as opposed to burst. 1 is normal, 1.2 is 20% slower, 0.8 is 20% faster, etc.
var/autofire_slow_mult = 0.7
var/autofire_slow_mult = 1
/// If the gun is currently burst firing
VAR_PROTECTED/burst_firing = FALSE
/// If the gun should display its ammo count
Expand Down
11 changes: 1 addition & 10 deletions code/modules/mob/living/carbon/xenomorph/life.dm
Original file line number Diff line number Diff line change
Expand Up @@ -220,19 +220,10 @@
if(stomach_contents.len)
for(var/atom/movable/M in stomach_contents)
if(ishuman(M))
if(world.time > devour_timer - 50 && world.time < devour_timer - 30)
to_chat(src, SPAN_WARNING("You're about to regurgitate [M]..."))
playsound(loc, 'sound/voice/alien_drool1.ogg', 50, 1)
var/mob/living/carbon/human/H = M
if(world.time > devour_timer || (H.stat == DEAD && !H.chestburst))
if(H.stat == DEAD && !H.chestburst)
regurgitate(H)

M.acid_damage++
if(M.acid_damage > 300)
to_chat(src, SPAN_XENODANGER("\The [M] is dissolved in your gut with a gurgle."))
stomach_contents.Remove(M)
qdel(M)

/mob/living/carbon/xenomorph/proc/handle_regular_hud_updates()
if(!mind)
return TRUE
Expand Down
5 changes: 5 additions & 0 deletions html/changelogs/AutoChangeLog-pr-321.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
author: "sunofang"
delete-after: True
changes:
- rscadd: "Due to budget increases, Close Air Support now has ammo."
- admin: "Added a fire support menu for GM's to use."
4 changes: 4 additions & 0 deletions html/changelogs/AutoChangeLog-pr-340.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
author: "Doubleumc"
delete-after: True
changes:
- rscadd: "Added GM button to toggle AI xeno weeding"
5 changes: 5 additions & 0 deletions html/changelogs/AutoChangeLog-pr-350.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
author: "Kitsunemitsu"
delete-after: True
changes:
- rscadd: "Added 3 more railgun types"
- balance: "Railgun now changes it's stats based off the altitude"
4 changes: 4 additions & 0 deletions html/changelogs/AutoChangeLog-pr-354.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
author: "Doubleumc"
delete-after: True
changes:
- bugfix: "less lag from xenos pathfinding unreachable targets"
20 changes: 20 additions & 0 deletions html/changelogs/AutoChangeLog-pr-359.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
author: "Doubleumc"
delete-after: True
changes:
- qol: "Adds the ability to hide your action buttons"
- bugfix: "Fixed 'hidden' action buttons being shown to observing players."
- qol: "Made any observers transfer over when a Xenomorph evolves/de-evolves."
- rscadd: "Added 'observe' functionality to Xenomorphs, allowing observers to view the target's UI."
- rscadd: "Made observing a player also show their action buttons."
- spellcheck: "Made observers see the marine version of CAS warnings, rather than the xeno one."
- qol: "Made open TGUI windows transfer over when a xeno player evolves."
- bugfix: "Fixed observing a monkey/farwa/stok/etc. locking the camera onto it."
- bugfix: "Observer minimap should no longer occasionally show wrong / no map."
- code_imp: "environmental reverb applies more reliably and only to positional sounds"
- bugfix: "Notifications should no longer emit light."
- bugfix: "Sprite-click shots onto Xenos are no longer affected by limb-targeting penalty, because it was an accuracy debuff when there is no inherent benefit to targeting Xeno limbs."
- rscadd: "Locking down dropship's doors closes them before locking."
- bugfix: "Fix handling of sentry_computer deletion"
- refactor: "Refactored the overlay_lighting component to better handle objects deleting"
- bugfix: "Fix putting lights in bags somereason keeping the light on"
- refactor: "sentry laptop now uses camera manager component"
3 changes: 3 additions & 0 deletions html/changelogs/archive/2024-08.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@
- rscadd: 'added more cigarette options in the loadout, along with a golden zippo

:cl:'


2024-08-10:
Doubleumc:
- qol: Adds the ability to hide your action buttons
Expand Down Expand Up @@ -104,3 +106,4 @@
- rscadd: Added something
private-tristan:
- rscadd: ports TG strip menu

Loading