warriorstar-orion and GitHub
349eca230c
mapmerge: Separate DMM conflicts for distinct atom root types. ( #22609 )
...
* Separate DMM conflicts for distinct atom root types.
* clarify order of operations
2023-11-01 20:37:18 +00:00
Bakaface and GitHub
cf4db2d0f4
Grammar and formatting/issue 23065/broken dropwall generator description typo ( #23118 )
...
* assigns the item_state var the same color assigned to the icon_state var in the lighter/random/New() proc
* fixes the typo in deployable.dm
* oops
2023-11-01 20:20:08 +00:00
Nathan Winters and GitHub
b8e98144c6
Tones down the demand for Ash ( #22923 )
...
* Make oil fireflash depend on remaining empty space
* Split feedback message
* Update oil fireflash size scaling
* Slightly buff oil -> ash production
* Clarify feedback messages
* Make violent oil fireflashes not produce ash
* Make charcoal recipe require less ash
* Violence begone
2023-11-01 20:15:48 +00:00
GDN and GitHub
65cab6910f
adds a pulse demon demon heart ( #22810 )
...
* adds a pulse demon demon heart
* fixes + shock HARDER
2023-11-01 20:13:12 +00:00
Bjamcham and GitHub
d8bb2c028b
Handheld mirror buff zoooooom ( #22967 )
2023-11-01 20:12:26 +00:00
94b9f85a7c
Adds tabs to the cling menu ( #22902 )
...
* cling menu
* Update code/modules/antagonists/changeling/changeling_power.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* comment added
---------
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
2023-11-01 20:11:44 +00:00
ed8406d707
You have unlocked: Greedier mode! ( #22884 )
...
* You have unlocked: Greedier mode!
* Apply suggestions from code review
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Update debuffs.dm
* Apply suggestions from code review
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
---------
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
2023-11-01 20:11:08 +00:00
e7b396eddf
Silicon Chamo properly hides huds ( #22312 )
...
* hide hud
* more documentation
* Update code/modules/mob/mob_vars.dm
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
* Update code/modules/mob/mob_vars.dm
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
---------
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
2023-11-01 20:10:15 +00:00
357c62b6d7
Ports hitscan from TG, adds it to *SELECT* things ( #22754 )
...
* this was just going to be a plasma cutter change but no had to make it look good, whats next, ai sat turrets (yes)
* ai turret
* Coca cola, don't forget the ice. Or the pulse
* almost done, pull master than map edit
* we ball
* ah, chasms.
* it's for the best. Fuck should not sleep checker though
* hitscan reflection limiting system
* Apply suggestions from code review
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* c-c-c-changes
---------
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com >
2023-11-01 20:05:27 +00:00
Bjamcham and GitHub
a75fe99595
fixes a revenant runtime ( #23112 )
2023-11-01 00:28:08 -04:00
95d3a49929
Ports Malf AI rolling (and some other tipping refactors) ( #21900 )
...
* some thoughts
* I really forgot to commit all of this didn't I
* Rework vendor crits
* fixes some angle jank
* yeag
* Patches up most bugs with tilting things over
* Fixes up most of the AI logic
* rolling AI can now take teleporters, visual effect is now only seen by the AI
* better effects
* Remove a bunch of now useless code
* I keep forgetting this
* cleanup in aisle seven
* oops
* some more testing
* adminbus hours
* Fixes some buildmode stuff, does some more testing
* Add documentation
* Demo bugs
* Apply suggestions from code review
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* rework crit damage amount
* Adapt recent tg changes
* Fix some small bugs in testing, contra review 1
* contra review 2
* Fixes tipping with pacifism
* restore removed icons
* Fix some remote untipping
* restore the roll action
* finally address contra's review (sorry)
* remove debug tool
* Move untilt logic into component
---------
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
2023-10-31 20:24:52 +00:00
DGamerL and GitHub
49afcce327
Purging the wishgranter ( #22976 )
...
* Everything except the map
* Deletes the ruin
* Makes CI not fail
* I pray this fixes it
2023-10-31 18:46:43 +00:00
Mitchs98 and GitHub
c027e8af60
woopsiedaisy uwu ( #23087 )
2023-10-31 18:41:59 +00:00
Bakaface and GitHub
6470b078a2
Feature/puts other cubes in biogenerator ( #23077 )
...
* adds the other types of meat cubes into the biogenerator
* Revert "adds the other types of meat cubes into the biogenerator"
This reverts commit c6f710c29e
2023-10-31 18:41:05 +00:00
233cc473fe
Toilet water changes ( #23080 )
...
* hgcvhgfcjtfckhc
* Update code/modules/reagents/chemistry/reagents/water.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* never make me balance team please
---------
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
2023-10-31 18:37:43 +00:00
JimKil3 and GitHub
a5812e0245
Dionae can now drop nymphs they've picked up ( #23020 )
...
* the feature
* sirryan review
* oopsies
(adds an #undef)
2023-10-31 18:36:53 +00:00
1080pCat and GitHub
5dff836b09
forced extended death is bad for this kinda mode ( #22989 )
2023-10-31 18:36:02 +00:00
GDN and GitHub
f6d3f955dc
lets people open their character creator before SSatoms is set up ( #22986 )
2023-10-31 18:35:45 +00:00
7e7f03c906
Elite Tactical Magboots ( #22968 )
...
* here we go
* notes
* sprites
* this is needed
* some tweaks to gear
* nit
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
* fix this
---------
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
2023-10-31 18:35:05 +00:00
e5b668a1d1
Return of Var on Cyberiad ( #22674 )
...
* Update cat.dm
* forsaken cat change
* Update code/modules/mob/living/simple_animal/friendly/cat.dm
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
* Update feral_cat.dm
---------
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
2023-10-31 15:48:20 +00:00
Contrabang and GitHub
a62bb8d89f
Wizard's Den remap number #16,294,324 ( #22668 )
...
* WIZARDDDD
* comment
* ok fuck airless turfs
* uhh
* okey, fix I think?
* fixed
2023-10-31 14:06:40 +00:00
ppi13 and GitHub
661366b53b
[s] Observers are immune to shuttlecrush ( #23108 )
...
* observers are now immune to shuttlecrush
* Moves it a step
2023-10-31 14:54:52 +01:00
8e612d9f8e
TGUI: HonkBot ( #22999 )
...
* TGUI
* ui_data
* why am I coding even?
* size
* Update code/modules/mob/living/simple_animal/bot/honkbot.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* dunno
* bundle
* bundle
---------
Co-authored-by: Deniz <66401072+Oyu-De@users.noreply.github.com >
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
2023-10-30 19:31:12 +00:00
S34N and GitHub
49b0071400
Repaths some decals, makes copyTurf copy decals ( #22528 )
...
* why do I do this to myself
* pass 2
* maps
* delete this
* PR number obtained
* Revert "maps"
This reverts commit 87926f4a0c
2023-10-30 20:15:14 +01:00
DGamerL and GitHub
0366df0641
Fixes AI eyes able to be shuttlecrushed ( #23085 )
...
* Fixes it
* Contra review
2023-10-30 20:12:18 +01:00
warriorstar-orion and GitHub
7835ff6de4
Apply living checks to dispenser stations. ( #23034 )
2023-10-30 19:11:20 +00:00
GDN and GitHub
9dc884207f
fixes mail not working sometimes ( #23024 )
2023-10-30 19:10:59 +00:00
DGamerL and GitHub
cb511ae725
Fixes it all, I hate it ( #23008 )
2023-10-30 19:10:39 +00:00
Bjamcham and GitHub
3e4cb4c25a
Expanded ghost gas analyzer ( #22914 )
...
* Please don't shoot me this time
* Added descriptor
* This one actually works, please don't shoot me
* Spacing fix
* proper documentation
2023-10-30 19:09:37 +00:00
faaa2fb392
Rebalances some more traitor item costs ( #22907 )
...
* This should be all
* It was in fact not all
* There was even more
* And the last one I forgot
* Update code/datums/uplink_items/uplink_traitor.dm
Co-authored-by: Coolrune206 <71326864+Coolrune206@users.noreply.github.com >
* Henri review
---------
Co-authored-by: Coolrune206 <71326864+Coolrune206@users.noreply.github.com >
2023-10-30 19:09:12 +00:00
9bb010b9ab
some tweaks for hardmode ( #22809 )
...
* some tweaks for hardmode
* Update colossus.dm
* fail safes / other fixes
* oops pressed compile but had an active thing open
* bubblegum nerfs
* nerfs the self healing on guidance
* crusher bubble care
* and finally, the portal to the second arena, so a rescue might happen. Maybe.
* oh right the legion core related murders
* lets not make modsuit users suffer
* oops
* whoops
* fixes legion loot
* changes requested
* terminal smooth brain
* Update code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
* comment
---------
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
2023-10-30 19:08:49 +00:00
30c6a59d63
Improve readability of health scanners ( #22905 )
...
* improves medscanner output
* remove comment block
* update colors with dark/light mode css
* Update goon/browserassets/css/browserOutput.css
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
---------
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
2023-10-30 19:07:00 +00:00
7287357472
Tweaks SOO/NNO/Syndie Officer Outfits ( #22965 )
...
* more than cigars!
* henri review
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
---------
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
2023-10-30 19:04:27 +00:00
Farie82 and GitHub
2d23ee4aaa
Fix prayer breads ( #23056 )
2023-10-30 19:03:47 +00:00
a7568f73b4
Fixes slime people physique not showing ( #23083 )
...
* damn you octus!
* Update code/modules/mob/living/carbon/human/human_examine.dm
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
* fixes contras suggestion
---------
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
2023-10-30 16:45:25 +00:00
Henri215 and GitHub
de50855e45
TG port: New display, pod control and request console sprites ( #22979 )
...
* TG port: New display, pod control and
request console sprites
* fixing pod control sprite animation speed
2023-10-29 20:55:39 +00:00
27dcf8c04a
520 ( #23057 )
...
Co-authored-by: Deniz <66401072+Oyu-De@users.noreply.github.com >
2023-10-29 21:06:54 +01:00
BiancaWilkson and GitHub
4ac6435015
cheeseless cheese ( #23047 )
2023-10-29 21:06:42 +01:00
JimKil3 and GitHub
cfef9d1bf2
Tweaks *twirl ( #22882 )
...
* twirling
* redoes everything
* damnit lewc
* early return
2023-10-29 21:03:28 +01:00
SchrodingersWolf and GitHub
7f3416e028
Updates some cloner error messages to be clearer ( #23029 )
...
* Cloner error. Guess I will just morgue them then.
* Swapped around some logic regarding husking
2023-10-29 19:52:18 +00:00
c59c62504a
TGUI: Floobot ( #22558 )
...
* commented out
* deleted bridge mode and targetdirection
* Fixes replace tiles bug
* Autotile - Damaged floor fix
* TGUI Floorbot Initial commit
* Update code/modules/mob/living/simple_animal/bot/floorbot.dm
review commit - moves bot specific down a line
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
* unused import
* updated spacing , list to box
* Moved comment
* test ignore
* IT WORKS YAY
* fixed branch + bundle
* waiting refactor
* spacing. think this is the last edit
* spacing
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
* merge conflict
* bundle
---------
Co-authored-by: Deniz <66401072+Oyu-De@users.noreply.github.com >
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
2023-10-29 19:18:41 +00:00
Bjamcham and GitHub
c24995f5b3
Voluuuuuuuuuume ( #23059 )
2023-10-29 16:24:28 +00:00
Sadhorizon and GitHub
765c0f7a75
civilian makes the return /s ( #22701 )
2023-10-29 10:21:48 +00:00
Qwertytoforty and GitHub
c98ca1c9b6
eyes of yellow, scales and feathers, tails and teathers, turn the lights off ( #22783 )
2023-10-29 10:19:57 +00:00
1080pCat and GitHub
5f38561464
Janitorial ERT rekit/buff and a few additions for the jani ert squad. ( #22913 )
...
* jani ert buffs yummy
* yipiee
* beh
* Bruzah and DGL review
* Update ert_outfits.dm
2023-10-29 10:19:08 +00:00
3dc52b9f1f
Reworks some trader pools. ( #22969 )
...
* oh boy let us have some heads roll
* le comma au chocolate
* perhaps we we want them to be able to build it
* mmm ice cream sandwich cereal
* Update code/game/objects/items/weapons/storage/boxes.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Update code/game/objects/items/weapons/storage/boxes.dm
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
* lablled
* Apply suggestions from code review
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* solcase
---------
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
2023-10-29 10:18:35 +00:00
Henri215 and GitHub
7474cf10aa
Sentry bot no longer drops ed209 loot when destroyed ( #23043 )
2023-10-29 10:16:38 +00:00
Bjamcham and GitHub
f903b78078
I plead whoops ( #23045 )
2023-10-29 10:16:17 +00:00
Bakaface and GitHub
b3c5fa6493
Fixes the typo in the appearance list ( #23049 )
2023-10-29 10:16:02 +00:00
Bjamcham and GitHub
81a1105d74
I feel like I'm missing something ( #23062 )
2023-10-29 10:15:36 +00:00
