cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-02-04 05:18:12 +00:00
Code Issues Packages Projects Releases Wiki Activity
73,944 Commits 63 Branches 14 Tags
63b3d2f2e7ca36ae8b32eb675d6116bfb2ff69c4
Commit Graph

31958 Commits

Author SHA1 Message Date
Azarak
63b3d2f2e7 Merge pull request #71 from Skyrat-SS13/upstream-merge-52435 
[MIRROR] Fixes secret sauce resetting too often and adds some logging.
 2020-07-26 02:51:46 +02:00
Azarak
48f66804ef Merge pull request #70 from Skyrat-SS13/upstream-merge-52450 
[MIRROR] Correctly categorises cybernetic stomachs in the Exosuit Fabricator
 2020-07-26 02:51:11 +02:00
Azarak
90d622cb2f Merge pull request #69 from Skyrat-SS13/upstream-merge-52445 
[MIRROR] SimpleMob AI now enters IDLE state when a client enters a z level
 2020-07-26 02:50:34 +02:00
Azarak
62586754f2 Merge pull request #65 from Skyrat-SS13/upstream-merge-52414 
[MIRROR] Reduces possible cargo express pod spam
 2020-07-26 02:45:17 +02:00
Azarak
5a0ad77424 Merge pull request #64 from Skyrat-SS13/upstream-merge-52379 
[MIRROR] Fixes clothes repair for real
 2020-07-26 02:44:59 +02:00
Azarak
12377e062e Merge pull request #63 from Skyrat-SS13/upstream-merge-52390 
[MIRROR] Adds an metric ton of belt sprites and suit sprites for worn objects.
 2020-07-26 02:44:39 +02:00
Azarak
232203ab66 Merge pull request #62 from Skyrat-SS13/upstream-merge-52433 
[MIRROR] Add unit tests for metabolizing of all reagents and fix the ones that failed
 2020-07-26 02:02:18 +02:00
Azarak
a09f215f3f Merge pull request #59 from Skyrat-SS13/upstream-merge-52350 
[MIRROR] Fixes #51574 - Added a whitespace sanitizing proc
 2020-07-26 02:00:57 +02:00
Azarak
c699e04c7e Merge pull request #58 from Skyrat-SS13/upstream-merge-52466 
[MIRROR] Fixes AI integrity restorer functionality broken in #52265
 2020-07-26 02:00:40 +02:00
Azarak
c61fc99205 Merge pull request #56 from Skyrat-SS13/upstream-merge-51558 
[MIRROR] [READY] Swarmer Rework
 2020-07-26 01:59:38 +02:00
Azarak
25564d3da1 Merge pull request #49 from Skyrat-SS13/upstream-merge-52207 
[MIRROR] You can now take off clothes while on stasis
 2020-07-26 01:59:07 +02:00
Azarak
f16d142837 Merge pull request #48 from Skyrat-SS13/upstream-merge-52274 
[MIRROR] B.E.P.I.S. Version 2.0: Cargo Trimming
 2020-07-26 01:58:39 +02:00
Azarak
f68cc6424c Merge pull request #47 from Skyrat-SS13/upstream-merge-52364 
[MIRROR] Boots (and Coat) of Winter in the Vendor of Clothes
 2020-07-26 01:58:03 +02:00
Azarak
5da2332838 Merge pull request #46 from Skyrat-SS13/upstream-merge-52409 
[MIRROR] Fixes buckling issue on borgs
 2020-07-26 01:57:13 +02:00
Azarak
7189041c4e Merge pull request #45 from Skyrat-SS13/upstream-merge-52375 
[MIRROR] Cleans up food and drink recipes
 2020-07-26 01:56:51 +02:00
Azarak
0d90ac69fa Merge pull request #41 from Skyrat-SS13/upstream-merge-52383 
[MIRROR] Fix leading slashes and turn on linting for it
 2020-07-26 01:13:53 +02:00
Azarak
0492de3d8b Merge pull request #39 from Skyrat-SS13/upstream-merge-52401 
[MIRROR] Fixes contractorpods sending people to secret room hell
 2020-07-26 01:13:25 +02:00
Azarak
18655d6146 Merge pull request #55 from Skyrat-SS13/upstream-merge-52377 
[MIRROR] All antag types are now recognized for admin chat
 2020-07-26 01:13:06 +02:00
Azarak
e4a4c5d923 Merge pull request #54 from Skyrat-SS13/upstream-merge-52419 
[MIRROR] Moves AI eye to their shell upon disconnecting
 2020-07-26 01:12:46 +02:00
Azarak
9d5c527e9b Merge pull request #53 from Skyrat-SS13/upstream-merge-51786 
[MIRROR] [READY] Wounds part 2: Piercing wounds, dismemberment changes, housekeeping
 2020-07-26 01:12:23 +02:00
skoglol
4bf19c1a6e Merge pull request #52435 from AnturK/notsosecret 
Fixes secret sauce resetting too often and adds some logging.
 2020-07-25 13:23:26 -04:00
skoglol
3d8ecdd2e4 Merge pull request #52450 from Timberpoes/belly-feex 
Correctly categorises cybernetic stomachs in the Exosuit Fabricator
 2020-07-25 13:22:17 -04:00
skoglol
77de95878c Merge pull request #52445 from optimumtact/simplemobsai2 
SimpleMob AI now enters IDLE state when a client enters a z level
 2020-07-25 13:21:08 -04:00
skoglol
95cc8471a0 Reduces possible cargo express pod spam. (#52414) 2020-07-25 05:44:22 -04:00
Ryll Ryll
dbace85635 Fixes clothes repair for real (#52379) 
* fixes clothing fixing

* per roh

* durr
 2020-07-25 04:57:04 -04:00
ArcaneMusic
aade6fcdd3 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 01:59:31 -04:00
ShizCalev
ea351bc9ac 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:15 -04:00
Daniel Hultgren
1352b6bd8f 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 16:32:49 -04:00
Timberpoes
388dd07ac7 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 15:07:30 -04:00
SkyratBot
472c73da83 [READY] Swarmer Rework 2020-07-24 02:57:06 -04:00
IndieanaJones
1ceffcefb0 [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 02:57:06 -04:00
skoglol
4d53731658 Merge pull request #52377 from Ryll-Ryll/antag 
All antag types are now recognized for admin chat
 2020-07-24 00:14:07 -04:00
skoglol
1141df98b6 Merge pull request #52419 from zxaber/shell_indwell 
Moves AI eye to their shell upon disconnecting
 2020-07-23 22:26:26 -04:00
Ryll Ryll
a97c51b30b [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 22:20:09 -04:00
skoglol
f93e63f7d6 Merge pull request #52207 from Jared-Fogle/stasis-in-dorms-4 
You can now take off clothes while on stasis
 2020-07-23 12:02:39 -04:00
skoglol
cdd1dfa09b Merge pull request #52274 from ArcaneMusic/bepisv3 
B.E.P.I.S. Version 2.0: Cargo Trimming
 2020-07-23 12:00:25 -04:00
skoglol
cb48d8eaba Merge pull request #52364 from Galdar02/TheBootBranch 
Boots (and Coat) of Winter in the Vendor of Clothes
 2020-07-23 11:52:06 -04:00
skoglol
ec0ef0b44e Merge pull request #52409 from nightred/bug52404 
Fixes buckling issue on borgs
 2020-07-23 11:48:53 -04:00
skoglol
40b2dcf57e Merge pull request #52375 from OnlineGirlfriend/fooddrink 
Cleans up food and drink recipes
 2020-07-23 11:47:46 -04:00
skoglol
ef4836c1a5 Merge pull request #52383 from spookydonut/leadingslash 
Fix leading slashes and turn on linting for it
 2020-07-23 11:35:57 -04:00
skoglol
1228fa67f5 Merge pull request #52401 from MrDoomBringer/supplyContractorFix 
Fixes contractorpods sending people to secret room hell
 2020-07-23 11:11:05 -04:00
skoglol
a38b73edf4 Merge pull request #52412 from EdgeLordExe/FUCK 
HERETICS: ASH ASCENSION NO LONGER KILLS THE USER
 2020-07-23 10:55:33 -04:00
Useroth
60adc24537 Merge pull request #36 from Skyrat-SS13/upstream-merge-52416 
[MIRROR] Fixes cyborg cycling (and a runtime with uneq_active)
 2020-07-23 15:16:11 +02:00
Useroth
d599280259 Merge pull request #32 from Skyrat-SS13/upstream-merge-52373 
[MIRROR] Nerfs electrolysis reaction
 2020-07-23 15:15:51 +02:00
Useroth
bbc4bf2ece Merge pull request #34 from Skyrat-SS13/upstream-merge-52363 
[MIRROR] Fixes completing a bounty and not getting paid.
 2020-07-23 15:02:33 +02:00
ShizCalev
38edbe0269 Merge pull request #52416 from MrMelbert/testedCode 
Fixes cyborg cycling (and a runtime with uneq_active)
 2020-07-23 06:40:39 -04:00
ArcaneMusic
d93f5b7c2e 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 19:17:15 -04:00
skoglol
e41c7ee289 Nerfs electrolysis reaction (#52373) 2020-07-22 18:38:06 -04:00
Couls
dc5840dc4e 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 16:53:27 -04:00
Useroth
41c6428ca6 Merge pull request #29 from Skyrat-SS13/upstream-merge-52351 
[MIRROR] Fixed randomized toy crate runtime
 2020-07-22 14:21:22 +02:00