Commit Graph

52193 Commits

Author SHA1 Message Date
Maurukas a5aa02bad2 resolve conflicts with dissection removal 2020-07-11 09:51:14 -07:00
Maurukas 97afe271f8 unassuming 2020-07-10 16:21:27 -07:00
Maurukas d5bd6777ab aheals, suggested logic cleanup 2020-07-10 16:21:27 -07:00
Maurukas 98a0f966fb Add Jared's suggestion
Co-authored-by: Jared-Fogle <35135081+Jared-Fogle@users.noreply.github.com>
2020-07-10 16:21:27 -07:00
Maurukas b539bfce0b shift start burnt wings
Moths who enter NT employment with burnt wings may not take advantage of this surgery, receiving "Plain" wings.
2020-07-10 16:21:27 -07:00
Maurukas 17386990ce add wing reconstruction
Adds surgical reconstruction of moth wings.
2020-07-10 16:21:26 -07:00
nemvar 9ec9897bb3 Barrel melons no longer turn water into wine (#52075) 2020-07-10 20:26:42 +02:00
ShizCalev 90fef217c7 Fixes anchored state mismatch for field generators on delta (#52056) 2020-07-10 20:21:12 +02:00
tralezab caa6f771fe [READY] Adds monkey sentience caps! (#51621)
* monkey mind caps!

* sprites 1/2 + polish checklist

* athath suggestions

Co-authored-by: ATH1909 <42606352+ATH1909@users.noreply.github.com>

* weird, this file says it was changed i wonder what that is

* review (conflict fixes next)

* conflicts + all the colors of hats

* remove

* done

* k

* done, but must readd sprites

* sprotes back

* Update helmet.dm

Co-authored-by: ATH1909 <42606352+ATH1909@users.noreply.github.com>
2020-07-10 10:36:55 +02:00
ラッピ from PSO2 41440f1081 White-Kit Medibot Hotfix (#52101)
About The Pull Request

White Kits do not have a damagetype, so they were setting the damage healed to null instead of brute
Why It's Good For The Game

Fix
2020-07-10 13:11:23 +12:00
zxaber 6452cc157d Fixes the Malf borg machine's conveyors not actually moving things (or people) (#51949)
* Is the device plugged in?

* processing update
2020-07-09 20:33:39 +02:00
Jordan Brown a020c2eaee oh yeaaaaah (#52096) 2020-07-09 13:44:08 -04:00
Jared-Fogle 4b21913c58 Add unit tests for some surgeries, adds more APIs for unit tests to call (#52093)
* Add unit tests for medical related stuff

* Remove inaccurate assertion
2020-07-09 13:41:59 -04:00
skoglol 85a7928b34 Merge pull request #52097 from Timberpoes/tgui-orbit-feex
Fixes some Ghost Orbit menu issues
2020-07-09 16:03:31 +02:00
skoglol c0e123aba2 Merge pull request #51999 from EdgeLordExe/hbalancing4
HERETICS : fixes an infinite summons exploit.
2020-07-09 16:00:09 +02:00
NightRed 4a9d8dda2f fixed issue with the destructive analyzer (#51869)
* fixed issue with the destructive analyzer

* changed how sheets are processed
2020-07-08 22:51:12 -04:00
tralezab 7af27992b5 [READY] Mafia Documentation and Improvements (#52065)
* controller doc'd

* k traitors work, can't target themselves and sounds for gamestart is louder

* ARGUMENTS!

* missed one tee hee

* better sound playing, ghosts can hear the game sometimes

* removal of "= null"

Co-authored-by: ラッピ from PSO2 <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>

* clearer explanation

Co-authored-by: ラッピ from PSO2 <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>
2020-07-08 16:44:42 -04:00
FloranOtten 791a3897bf Gives families cops bowman headset, internals (#51921)
* fix

* COMMAS ARGH
2020-07-08 15:19:59 -04:00
ShizCalev f4c54ccea4 Fixes mobs that aren't able to speak being able to cast spoken spells (#52054)
* Fixes wizard speaking

* defines
2020-07-08 19:25:39 +02:00
ShizCalev d2e9139619 Fixes blob victory runtime (#52053)
* Fixes blob victory runtime

* loc
2020-07-08 19:24:22 +02:00
Timberpoes 3d2aa32810 Limit scope of locate 2020-07-08 16:40:00 +01:00
skoglol fd19aceb8b Merge pull request #52048 from Tlaltecuhtli/shutte-doors
votes now play a sound when they get started
2020-07-08 17:17:35 +02:00
ShizCalev ea9696341d fixes laserpointer runtime (#52074) 2020-07-08 10:27:04 -04:00
Jordie ad7c6c0245 Removes global bookcache (#51891)
* removes global bookcache

* added timeout for topic calls and renames cooldown var

* change to using cooldown defines

Co-authored-by: Jordie0608 <=>
2020-07-08 09:36:16 -04:00
Tlaltecuhtli a38162a8bc new noise 2020-07-08 13:52:17 +02:00
Timberpoes 761c1a9e03 Orbit feex 2020-07-08 11:24:00 +01:00
AnturK bff0df0e8c [Ready?] Mech vs Mech combat system! ... (For toy mechs.) (#51817)
* Mech battle system!!

* suicide_act

* sounds

* a few checks here and there + comments

* polish

* restores a deleted attack_hand

* cleans up some indents

* incapacitated people can't have epic fights

* CONTRIBUTING.md compliance that i missed

* fixes doc, suicide, adds a sleep proc for ease

* fixes a minor sin + makes it pretty

* moved file

* anime

* "balancing"
2020-07-08 11:58:32 +02:00
skoglol 25d5e0590b Merge pull request #52051 from Wayland-Smithy/spiny_reaction
Fixes Blob strain reactive spines analyzer effect description
2020-07-08 11:37:05 +02:00
skoglol 783f1022e1 Merge pull request #52069 from Wayland-Smithy/blob_mass_thicc_status
Shows sentient Blob mobs the critical mass progress as a status
2020-07-08 10:57:51 +02:00
MrMelbert 5230ee09b1 oh yeaaaaah 2020-07-08 02:46:20 -05:00
Wayland-Smithy d635d3cf38 the truth menaces with spines 2020-07-07 21:58:28 -04:00
Jared-Fogle a375cfcdc6 Fixes tend wounds not doing anything (speedmerge please) (#52081)
* Fixes tend wounds

* Fixes brain surgery, this was the last one
2020-07-07 17:53:45 -04:00
Unknown 3f50204b48 E 2020-07-07 23:30:39 +02:00
ArcaneMusic 57a7eee5ec Arconomy Productions presents: The Bounty Board (#51449)
* Startwork

* stopwork again

* AGAIN.

* Good place to call it for now

* Startwork but I actually put some work in

* The left list doesn't work, stop for now.

* God remind me to squash these commits later.

* Well, I think I can safely say I have actual work done now

* The post-Brisk iced tea patch.

* God damnit nothing works I hate this worl

* Good place to stop, stuck in a chronic error state

* I take it back now I need to sleep jesus god

* I am grown POWERFUL in my dispair

* FINALLY READY TO PR.

* Request order swap

* Update and tgui recompile

* Adds a kiosknet, so adding a new bounty alerts all the bountyboards

* Renames file, attempts to port to modular app too because fuck my life

* Fuckin feature creep I tells ya

* Removes an unused proc

* Rebuildin

* Hopefully updates tgui and fixes an easy runtime

* Finishes updating/conflicts

* Mapmerges my shit.

* Rebuilds tguiiiiiiiiiiii

* Updates tgui

* Updated once more

* merge conflict fixaroni

* God I wish that I had a game I was dedicated enough to finish in a single setting

* Rebuild of PR: You will (Not) compile

* Cobby's changes and Anturk's Suggestions.

* Should probably prevent a runtime.

* Rebuilds TGUI.

* Lets not delete my own files please god

* Style's changes

* ALL the warriors

* What if I didn't delete ZX's app sprites again

* Start workin on a text component later

* Makes some code suggestions, doing it all in UI will kill me

* tgui update

* DNM until I get this gosh darn text working.

* The changes that I need afaik

* And a tgui rebuild to boot

* When that program datum spoke to me, I felt that.

* Makes changes to text input sanity, Pray

* By god I think I've cracked the code.

* Had no idea you could atomize UIs like that, this is revolutionary

* Spaces

Co-authored-by: Aleksej Komarov <stylemistake@gmail.com>
2020-07-08 00:29:49 +03:00
Fikou a8f5bbc2fb manly dorf now doesnt work on alcohol tolerance, ups boozepower for dorfs (#51940)
* manly dorf now still gets you drunk with dorf mutation

* ok i guess

* Update code/modules/reagents/chemistry/reagents/alcohol_reagents.dm

YEAH OK MR COBBLESTONE I WILL DO IT!!!!!!!!!

Co-authored-by: ラッピ from PSO2 <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>

Co-authored-by: ラッピ from PSO2 <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>
2020-07-07 16:00:16 -04:00
ShizCalev 2a71acefa0 Merge pull request #52045 from Fikou/patch-35
fixes labor camp beacon sprite
2020-07-07 10:43:03 -04:00
skoglol 60b2e568ec Merge pull request #52009 from ShizCalev/box-examine-text
Adds a bit of examine text to bots
2020-07-07 16:32:51 +02:00
ShizCalev cc83c3598b Merge pull request #51919 from tralezab/branched-from-upstream-master
Painting frames are no longer ERRORs
2020-07-07 10:32:34 -04:00
skoglol c43491d87f Merge pull request #51998 from Jared-Fogle/banished-to-the-cryo-chamber
Fix cryo cells locking up those with prosthetic limbs
2020-07-07 16:30:18 +02:00
skoglol 4f7ff32aed Merge pull request #52033 from optimumtact/namesanity
Improve bad name sanitisation function
2020-07-07 16:29:21 +02:00
skoglol ad4b78a5c5 Merge pull request #52034 from ShizCalev/energy-gun-icons-m2
Unfucks worn energy gun icons... again
2020-07-07 16:27:05 +02:00
skoglol 615f824010 Merge pull request #52036 from ShizCalev/gun-overlay-fix
Fixes L6 inhands
2020-07-07 16:23:55 +02:00
skoglol 959270568a Merge pull request #52037 from ShizCalev/gun-magazine-overlay-fix
Fixes magazine overlays not working
2020-07-07 16:23:10 +02:00
Fikou 188ced8d57 makes heat protection from explorer suits a bit better (#51834)
* makes heat protection from explorer suits a bit better

* i rart
2020-07-07 10:20:57 -04:00
ArcaneMusic 042e4df1ba Adds 2 new plants and 2 new plant traits. (#51789)
* Initial Commit ya dig

* I had no idea you could do this. This feels illegal, is this illegal?

* Suggestions made, plus comments and prepare result cleanup

* Fixes conflict

* Adds more documentation

* :Lenny:
2020-07-07 10:16:35 -04:00
Jared-Fogle 418bd80a6b Remove healing skill (#52005)
* Remove healing skill

* Remove dissection from tech web
2020-07-07 10:10:12 -04:00
LordVollkorn e25c7bff77 HOTFIX: Fixed the wrong type of anomaly core (#52072)
About The Pull Request

The raw vortex anomaly core requirement is fixed so the device accepts proper vortex anomaly cores.
Changelog

🆑 Jay Smith
fix: The Portable Chemical Mixer now uses proper vortex anomaly cores instead of raw ones.
/🆑
2020-07-07 23:33:56 +12:00
Wayland-Smithy 3bcbf71698 Sentient blob mobs legit mass status 2020-07-07 04:12:52 -04:00
ShizCalev 8447ce2847 MULEbot code cleanup & fixes (#51987)
cl ShizCalev
refactor: Optimized a good chunk of MULEbot code, fixing things such as it rebuilding it's overlays/icons 5 times every second while moving to a destination. Less free lag!
fix: Fixed MULEbots closing crates when the crate doesn't actually get loaded onto it.
fix: Fixed the maintenance hatch on MULEbots visually closing for a moment when emagged.
fix: Paranormal MULEbots will no longer briefly turn into a normal MULEbot when emagged.
fix: Fixed interface exploits involving paranormal MULEbots carrying ghosts.
fix: Fixed MULEbot blood tracks sometimes facing the wrong direction.
fix: Player controlled MULEbots will now leave bloody tracks if they've run over a mob.
fix: Fixed players riding MULEbots sometimes appearing underneath it instead of ontop of it.
fix: Fixed AI's making a chiming noise when they receive a remote notification from a MULEbot. Now only the AI will hear the notification's sound.
fix: Fixed MULEbots dropping mobs off at their current location instead of at their dropoff point.
fix: Fixed a minor runtime related to MULEbots dropping off deleted items/mobs.
fix: Fixed mobs having the wrong height offset when riding MULEbots.
fix: Fixed mobs sometimes ending up underneath MULEbots while riding them.
fix: Fixed mobs not falling off MULEbots when stunned / incapacitated.
fix: Fixed inducers not recharging MULEbots.
fix: Fixed MULEbots leaving bloody tracks in space.
fix: Fixed MULEbots leaving multiple blood tracks in the same spot if they failed to move.
fix: Fixed hacked MULEbots spamming messages about knocking down a mob when they didn't actually do it.
fix: Fixed MULEbot commands not resetting when they were turned off.
fix: Fixed MULEbots not turning off properly when their maintenance hatch is opened.
fix: Fixed MULEbots not turning off properly when they ran out of power while moving.
fix: Fixed MULEbots flashing their external warning lights while they're turned off when their avoidance wire is cut.
fix: Fixed mobs being able to walk right over MULEbots when they turn off.
fix: MULEbots will now try to put their powercell in your hands when you remove them with a crowbar.
fix: Fixed the interface for MULEbots briefly looking like you turned it on successfully even though it was out of power.
fix: MULEbots will now provide feedback if they fail to turn on due to their maintenance panel being open.
fix: MULEbots will no longer flash and beep when their wires are pulsed if they don't have power.
fix: MULEbots will now actually flash when their external warning lights are pulsed.
tweak: MULEbots will now flash when they beep / buzz.
add: Added a bit more examine text to MULEbots.
/cl

Fixes #42918
Fixes #46030
fixes #38594
2020-07-07 11:05:09 +12:00
LemonInTheDark 92209dd23a Sweeps up some rarely used and unbalanced sources of research points (#52012)
About The Pull Request

Removes the research point gen modes from tesla coils and rad collectors.
Someone is gonna take some flak for removing these at some point, may as well be me.
Why It's Good For The Game

THE DESIGN DOC DICTACT-

Nah powergen should be valid on it's own, it shouldn't need to rely on other econs to make it worth the work. We can try that later, but not now.
Changelog

cl
del: Removed the research modes from tesla coils and radiation collectors.
/cl
2020-07-07 11:02:33 +12:00