skoglol
bb451949b0
Merge pull request #52435 from AnturK/notsosecret
...
Fixes secret sauce resetting too often and adds some logging.
2020-07-25 19:22:32 +02:00
skoglol
7bff5f2a65
Merge pull request #52450 from Timberpoes/belly-feex
...
Correctly categorises cybernetic stomachs in the Exosuit Fabricator
2020-07-25 19:22:09 +02:00
skoglol
5d0b3341f4
Merge pull request #52445 from optimumtact/simplemobsai2
...
SimpleMob AI now enters IDLE state when a client enters a z level
2020-07-25 19:20:16 +02:00
skoglol
c90f7ea4c6
Reduces possible cargo express pod spam. ( #52414 )
2020-07-25 06:43:48 -03:00
Ryll Ryll
1a8078eabe
Fixes clothes repair for real ( #52379 )
...
* fixes clothing fixing
* per roh
* durr
2020-07-25 05:56:49 -03:00
ArcaneMusic
a6b367f8c8
Adds an metric ton of belt sprites and suit sprites for worn objects. ( #52390 )
...
* Plant Belt sprites are fixed, Engy Sprites too
* I did belt sprites until my eyes started hurting
2020-07-25 02:58:52 -03:00
ShizCalev
77fcbf3c0b
Merge pull request #52433 from Jared-Fogle/metabolization-tests
...
Add unit tests for metabolizing of all reagents and fix the ones that failed
2020-07-24 22:30:03 -04:00
Daniel Hultgren
dd359582d4
Fixes #51574 - Added a whitespace sanitizing proc ( #52350 )
...
* Fixed #51574 - Added htmlrendertext and implemented it for the voice analyzer
* Made a htmlrendertext regex static
Co-authored-by: Bobbahbrown <bobbahbrown@gmail.com >
* Made a htmlrendertext regex static again
Co-authored-by: Bobbahbrown <bobbahbrown@gmail.com >
2020-07-24 22:32:27 +02:00
Timberpoes
44a3c41e19
Fixes AI integrity restorer functionality broken in #52265 ( #52466 )
...
* Update AI health after healing damage in integrity restorer
* Also feex legacy AI inegrity restorer.
* Update IntelliCard icon when AI is successfully revived.
* Clean up proc arguments
* Feex
2020-07-24 16:06:38 -03:00
Timberpoes
11c026946c
Line endings changed from CRLF to LF ( #52469 )
2020-07-24 20:29:29 +02:00
IndieanaJones
616177f4cb
[READY] Swarmer Rework ( #51558 )
...
* Move swarmer.dm to the hostile simple mob folder, make changes
* Move swarmer event file to events, make changes
* Update Resource Pricing on Swarmer HUD
* Update traumas.dm
* Update parts.dm to remove deactivated swarmers
* Remove the Swarmer Drone Dispenser
* Remove swarmer.dm from the antagonist file
* Move the swarmer event to the events file
* Add a proper swarmer antagonist file
* Load proper files
* Various Fixes, Implement ATH's Rapid Consumption
* Utilize the Nightmare's Light Level Check on Xeno Spawns For Swarmers, Hopefully Filters Out Bad Spawns
* Update The Pricing In The Descriptions
* Get Rid of That Random Backslash
* Use the Proper Damage Proc for Cyborgs
* Fix the Bug Shiz pointed out
* Update code/modules/mob/living/simple_animal/hostile/swarmer.dm
Co-authored-by: Jordan Brown <Cyberboss@users.noreply.github.com >
* Fix the Swarmer Antagonist File
* Fix the traumas issue
* Update traumas.dm
* Update code/modules/events/swarmer.dm
Co-authored-by: Rohesie <rohesie@gmail.com >
* Update code/modules/mob/living/simple_animal/hostile/swarmer.dm
Co-authored-by: Rohesie <rohesie@gmail.com >
* Update code/modules/mob/living/simple_animal/hostile/swarmer.dm
Co-authored-by: Rohesie <rohesie@gmail.com >
* Update code/modules/mob/living/simple_animal/hostile/swarmer.dm
Co-authored-by: Rohesie <rohesie@gmail.com >
* Upload Swarmers Folder
* Remove the swarmer file from the hostile folder
* Update the swarmer megafauna to work with changes
* Load the seperated swarmer files
* Update code/modules/swarmers/swarmer_act.dm
Co-authored-by: Rohesie <rohesie@gmail.com >
* Update code/modules/swarmers/swarmer_act.dm
Co-authored-by: Rohesie <rohesie@gmail.com >
* Update code/modules/swarmers/swarmer_act.dm
Co-authored-by: Rohesie <rohesie@gmail.com >
* Update code/modules/swarmers/swarmer.dm
Co-authored-by: Rohesie <rohesie@gmail.com >
* Update code/modules/swarmers/swarmer.dm
Co-authored-by: Rohesie <rohesie@gmail.com >
* Catch-22 Variable
* Update code/modules/events/swarmer.dm
Co-authored-by: Rohesie <rohesie@gmail.com >
* Update code/modules/swarmers/swarmer.dm
Co-authored-by: Rohesie <rohesie@gmail.com >
* Update code/modules/swarmers/swarmer.dm
Co-authored-by: Rohesie <rohesie@gmail.com >
* Update code/modules/swarmers/swarmer.dm
Co-authored-by: Rohesie <rohesie@gmail.com >
* Update code/modules/swarmers/swarmer.dm
Co-authored-by: Rohesie <rohesie@gmail.com >
* Update code/modules/swarmers/swarmer.dm
Co-authored-by: Rohesie <rohesie@gmail.com >
* Update code/modules/swarmers/swarmer.dm
Co-authored-by: Rohesie <rohesie@gmail.com >
* Update code/modules/swarmers/swarmer.dm
Co-authored-by: Rohesie <rohesie@gmail.com >
* Update code/modules/swarmers/swarmer.dm
Co-authored-by: Rohesie <rohesie@gmail.com >
* Update code/modules/swarmers/swarmer.dm
Co-authored-by: Rohesie <rohesie@gmail.com >
* Update code/modules/swarmers/swarmer.dm
Co-authored-by: Rohesie <rohesie@gmail.com >
* Update code/modules/swarmers/swarmer.dm
Co-authored-by: Rohesie <rohesie@gmail.com >
* Update code/modules/swarmers/swarmer.dm
Co-authored-by: Rohesie <rohesie@gmail.com >
* Update code/modules/swarmers/swarmer.dm
Co-authored-by: Rohesie <rohesie@gmail.com >
* Update code/modules/swarmers/swarmer.dm
Co-authored-by: Rohesie <rohesie@gmail.com >
* Update code/modules/swarmers/swarmer.dm
Co-authored-by: Rohesie <rohesie@gmail.com >
* Update code/modules/swarmers/swarmer.dm
Co-authored-by: Rohesie <rohesie@gmail.com >
* Update code/modules/swarmers/swarmer.dm
Co-authored-by: Rohesie <rohesie@gmail.com >
* Update code/modules/swarmers/swarmer.dm
Co-authored-by: Rohesie <rohesie@gmail.com >
* Update code/modules/swarmers/swarmer_act.dm
Co-authored-by: Rohesie <rohesie@gmail.com >
* Update code/modules/swarmers/swarmer_act.dm
Co-authored-by: Rohesie <rohesie@gmail.com >
* Update code/modules/swarmers/swarmer_act.dm
Co-authored-by: Rohesie <rohesie@gmail.com >
* Update code/modules/swarmers/swarmer_act.dm
Co-authored-by: Rohesie <rohesie@gmail.com >
* Update code/modules/swarmers/swarmer_objs.dm
Co-authored-by: Rohesie <rohesie@gmail.com >
* Update code/modules/swarmers/swarmer_act.dm
Co-authored-by: Rohesie <rohesie@gmail.com >
* Update code/modules/swarmers/swarmer_objs.dm
Co-authored-by: Rohesie <rohesie@gmail.com >
* Update code/modules/swarmers/swarmer_objs.dm
Co-authored-by: Rohesie <rohesie@gmail.com >
* Update code/modules/swarmers/swarmer_act.dm
Co-authored-by: Rohesie <rohesie@gmail.com >
* Update code/modules/swarmers/swarmer_act.dm
Co-authored-by: Rohesie <rohesie@gmail.com >
* Update code/modules/swarmers/swarmer_act.dm
Co-authored-by: Rohesie <rohesie@gmail.com >
* Update code/modules/swarmers/swarmer_act.dm
Co-authored-by: Rohesie <rohesie@gmail.com >
* Update code/modules/swarmers/swarmer.dm
Co-authored-by: Rohesie <rohesie@gmail.com >
* Update code/modules/swarmers/swarmer.dm
Co-authored-by: Rohesie <rohesie@gmail.com >
* Update code/modules/swarmers/swarmer.dm
Co-authored-by: Rohesie <rohesie@gmail.com >
* Update code/modules/swarmers/swarmer.dm
Co-authored-by: Rohesie <rohesie@gmail.com >
* Update code/modules/swarmers/swarmer.dm
Co-authored-by: Rohesie <rohesie@gmail.com >
* Fix all the references in the swarmer megafauna file
* Fix method names in the swarmer mob file
* Fix method names in swarmer_act.dm
* Fix Method Names in swarmer hud file
* Update code/modules/swarmers/swarmer_objs.dm
Co-authored-by: Rohesie <rohesie@gmail.com >
* Update code/modules/swarmers/swarmer_objs.dm
Co-authored-by: Rohesie <rohesie@gmail.com >
* Update code/modules/swarmers/swarmer_objs.dm
Co-authored-by: Rohesie <rohesie@gmail.com >
* Update code/modules/swarmers/swarmer.dm
Co-authored-by: Rohesie <rohesie@gmail.com >
* Update code/modules/swarmers/swarmer.dm
Co-authored-by: Rohesie <rohesie@gmail.com >
* Update code/modules/swarmers/swarmer.dm
Co-authored-by: Rohesie <rohesie@gmail.com >
* Update code/modules/swarmers/swarmer_act.dm
Co-authored-by: Rohesie <rohesie@gmail.com >
* Update code/modules/swarmers/swarmer_act.dm
Co-authored-by: Rohesie <rohesie@gmail.com >
* Update code/modules/swarmers/swarmer_act.dm
Co-authored-by: Rohesie <rohesie@gmail.com >
* Update code/modules/swarmers/swarmer_act.dm
Co-authored-by: Rohesie <rohesie@gmail.com >
* Update code/modules/swarmers/swarmer_act.dm
Co-authored-by: Rohesie <rohesie@gmail.com >
* Update code/modules/swarmers/swarmer_act.dm
Co-authored-by: Rohesie <rohesie@gmail.com >
* Update code/modules/swarmers/swarmer_act.dm
Co-authored-by: Rohesie <rohesie@gmail.com >
* Update code/modules/swarmers/swarmer_act.dm
Co-authored-by: Rohesie <rohesie@gmail.com >
* Fix the naming issues to let it compile
* Change the Things Rohsie Wanted Changed
* Change CLRF Back To LF
Co-authored-by: Jordan Brown <Cyberboss@users.noreply.github.com >
Co-authored-by: Rohesie <rohesie@gmail.com >
2020-07-24 03:56:58 -03:00
skoglol
c344a461f7
Merge pull request #52377 from Ryll-Ryll/antag
...
All antag types are now recognized for admin chat
2020-07-24 06:13:18 +02:00
Ryll-Ryll
0824db9a82
fix comment
2020-07-23 22:50:58 -04:00
skoglol
29f3d543c6
Merge pull request #52419 from zxaber/shell_indwell
...
Moves AI eye to their shell upon disconnecting
2020-07-24 04:26:01 +02:00
Ryll Ryll
46dd89b07a
[READY] Wounds part 2: Piercing wounds, dismemberment changes, housekeeping ( #51786 )
...
* pierce the heavens
* starts doing projs
* continue pierce
* before armor
* before sharpness redefine
* rename sharp defines, before further implementation
* finishing undoing atk_type back to sharpness
* neatens up sharpness defines, FALSE -> SHARP_NONE
* more piercing, removes brute damage bleed, bubblegum no longer wound
* starts letting embeds get in on the fun
* half with embed
* work on dismembering
* continued embed work
* more moving bandaging to limbs
* more dismemberment work
* removing embed pierce stuff
* tweaking bullets
* more docs and work on dismemberment
* spans, piercing, guns
* dismemberment and scar fixes
* bee changes
* bullets embedding
* more bullet and dismember work
* dismemberment, surgery, piercing, formaldehyde,
* pleases travis
* pierce smite
* nicer on blood
* Auto stash before rebase of "tgstation/master"
* more neatening
* wounds only consider up to 35 damage, wounds on l6 and 762
* updates hulk
* balance
* defines
* lower slug to 50 brute to accommodate wounds
* adds differentiation for having flesh/bones/both in mobs
* moves scar descs to json, renames organic_state
* excises removed healing skill
* fixes logs, inconsistencies, some balance changes
* untab
* slight compress
* a
* kills pointed global list
* dmdoc
* halfway through roh
* finishes roh review
* okay NOW i finished roh's reviews
* roh roh roh your boat
* gently down the stream
* global lists
* list ops, fix scanner for bone gel improvised fix
* travis moment
* sounds added and moved
* pellet clouds can join the fun fully, slight gun balancing for wounds
* doc moment
* unconflicts myself
* update hulk
* Update code/_onclick/item_attack.dm
Co-authored-by: Rohesie <rohesie@gmail.com >
* crying ascii face
* final rohview
* oops
* final final
Co-authored-by: Rohesie <rohesie@gmail.com >
2020-07-23 23:19:30 -03:00
Timberpoes
662b62af1c
Feex mis-labeled category
2020-07-24 02:58:25 +01:00
oranges
dd3ebe14e3
SimpleMob AI now enters IDLE state when a client enters a z level
...
This occurs if no client was on the z level before they moved in
(implying the AI could have turned off)
If they are within a certain distance we also ask them if they want to
move from IDLE to fully awake and targeting
2020-07-23 22:06:01 +00:00
skoglol
f379659f06
Merge pull request #52207 from Jared-Fogle/stasis-in-dorms-4
...
You can now take off clothes while on stasis
2020-07-23 18:02:08 +02:00
skoglol
82744898bb
Merge pull request #52274 from ArcaneMusic/bepisv3
...
B.E.P.I.S. Version 2.0: Cargo Trimming
2020-07-23 17:59:47 +02:00
skoglol
ef12dc2764
Merge pull request #52364 from Galdar02/TheBootBranch
...
Boots (and Coat) of Winter in the Vendor of Clothes
2020-07-23 17:51:18 +02:00
skoglol
40b3110c01
Merge pull request #52409 from nightred/bug52404
...
Fixes buckling issue on borgs
2020-07-23 17:47:29 +02:00
skoglol
1e16e2569b
Merge pull request #52375 from OnlineGirlfriend/fooddrink
...
Cleans up food and drink recipes
2020-07-23 17:47:13 +02:00
skoglol
5a655ccf3d
Merge pull request #52383 from spookydonut/leadingslash
...
Fix leading slashes and turn on linting for it
2020-07-23 17:35:33 +02:00
nightred
e2ebb2ccd2
uses isliving instead of type check
2020-07-23 10:27:48 -05:00
skoglol
75844c469a
Merge pull request #52401 from MrDoomBringer/supplyContractorFix
...
Fixes contractorpods sending people to secret room hell
2020-07-23 17:10:40 +02:00
skoglol
18e419a49c
Merge pull request #52412 from EdgeLordExe/FUCK
...
HERETICS: ASH ASCENSION NO LONGER KILLS THE USER
2020-07-23 16:55:08 +02:00
ShizCalev
0b07864abc
Merge pull request #52416 from MrMelbert/testedCode
...
Fixes cyborg cycling (and a runtime with uneq_active)
2020-07-23 06:39:40 -04:00
AnturK
7edae52ee1
Fixes secret sauce resseting too often and adds some logging.
2020-07-23 12:23:36 +02:00
MrMelbert
f197c6d7b4
runtime fix
2020-07-23 04:29:39 -05:00
Jared-Fogle
55a204d375
Test metabolization of all reagents
2020-07-23 01:44:23 -07:00
ArcaneMusic
4b5bae4579
Fixes completing a bounty and not getting paid. ( #52363 )
...
* Fixes completing a bounty and not getting paid.
* Oh right that thing that I didn't commit
* Cleans up the parenthesis in the proc.
* Linter BEGONE
* Apply suggestions from code review
Co-authored-by: Rohesie <rohesie@gmail.com >
Co-authored-by: Rohesie <rohesie@gmail.com >
2020-07-22 20:16:59 -03:00
skoglol
da208b9631
Nerfs electrolysis reaction ( #52373 )
2020-07-22 19:23:52 -03:00
Couls
0a1c90d186
keybind signal support, ported from TGMC ( #52219 )
...
* keybind signal support, ported from TGMC
* Thank you linter
* remove unused and extra defines
* move signal defines up and fix emote keybind runtimes
* Apply suggestions
* Update keybinding.dm
* Missed this one in the upstream merge
* Ignore keybindings without names
* back to the OG
* Update living.dm
* Update living.dm
* got it
* trailing newline
* Update code/datums/keybinding/living.dm
Co-authored-by: Rohesie <rohesie@gmail.com >
Co-authored-by: Rohesie <rohesie@gmail.com >
2020-07-22 17:51:52 -03:00
Daniel Hultgren
cec6cbfa65
Fixed randomized toy crate runtime ( #52351 )
...
* Fixed randomized toy crate runtime
* Fixed NT TCG Booster Pack having same issue
2020-07-22 05:31:32 -03:00
skoglol
fa73ae9116
Removes forcesay on attack ( #52341 )
2020-07-22 05:29:41 -03:00
Dennok
e2b43e0dfe
Fix/silent #52334 runtime ( #52360 )
...
* Update components_base.dm
some less runtimes
* Update components_base.dm
Less check
* Update components_base.dm
2020-07-22 04:59:15 -03:00
Zxaber
9085e8a3bb
Moves AI eye to their shell upon disconnecting
2020-07-22 00:41:30 -07:00
ArcaneMusic
14c2017470
Merge remote-tracking branch 'upstream/master' into bepisv3
2020-07-22 03:05:04 -04:00
spookydonut
be4f3a4ee8
detections
2020-07-22 14:57:20 +08:00
Jared-Fogle
c3fd280a01
You can now take off clothes while on stasis
2020-07-21 23:16:55 -07:00
MrMelbert
892eebf1a1
one line fix
2020-07-22 00:44:44 -05:00
tralezab
864924a804
[READY] Mafia Additional Roles and Generic Randomized Setup ( #52083 )
...
* new roles
* Madness rename
* hop judgement override
* hop vote fixed, travis happy
* hop fixed
* Update code/modules/mafia/_defines.dm
Co-authored-by: Fikou <piotrbryla@onet.pl >
* highly experimental random setup system
* hop cannot reveal before any voting is possible, lmao
* this shit actually works lmfao
* removes forced_setup, nightmare detection immune
* whoop
* removes setups!
* OK, finally kind of done with all this minus the incoming reviews
* adds hop's ability to their text, removes old var
* bundle?
* Update tgui.bundle.js
* role fixes (roleblock not working on a few)
* eep
* fuck
* potato's review
* Update tgui.bundle.js
* ffff
* bundle
* rohesie's review
* eureka
* updates doc, removes debug stuff
Co-authored-by: Fikou <piotrbryla@onet.pl >
2020-07-22 00:29:05 -03:00
Unknown
d4f2b24904
E
2020-07-22 03:11:41 +02:00
Unknown
47726662c2
WE WIDE
2020-07-22 03:07:59 +02:00
Unknown
48e4e87756
E
2020-07-22 03:04:46 +02:00
nightred
2b249bc92f
must be living to buckle
2020-07-21 17:57:16 -05:00
skoglol
d9b88f5f66
Fixes keybind fuckup ( #52406 )
...
* Fixes keybind fuckup
* Right fix
2020-07-21 22:05:56 +02:00
skoglol
c2c6227fc8
Bumps minimum savefile version, fixes some forgotten hotkeys ( #52312 )
...
* Bumps minimum savefile version, fixes some forgotten hotkeys
* Removes job flags
2020-07-21 19:45:24 +02:00
skoglol
7565f1a9b5
Can no longer slimelink from a corpse ( #52342 )
2020-07-21 19:38:55 +02:00
AnturK
260be64005
Merge pull request #52339 from Jared-Fogle/youre-at-the-party-and-you-notice-that-the-drugs-arent-metabolizing
...
Fix colorful reagent, red powder, and hair dye breaking metabolization
2020-07-21 19:36:05 +02:00
