cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-06 15:02:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
73,987 Commits 60 Branches 14 Tags
539f50efd99296cd12f033aa97cdee63162cf921
Commit Graph

1021 Commits

Author SHA1 Message Date
ShizCalev
729a834e31 Merge pull request #52423 from nightred/clownops 
Fixes for clown op reinforcements
 2020-07-27 23:57:59 -04:00
ShizCalev
60c5be4a33 Update code/modules/antagonists/_common/antag_spawner.dm 2020-07-27 23:57:05 -04: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
nightred
a65b0094e0 and then I got docs 2020-07-24 22:26:14 -05:00
nightred
0a2f9d176d ahhem honked that up 2020-07-24 21:51:10 -05:00
nightred
9b17e20c93 reduce 2020-07-24 21:04:57 -05: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
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
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
998f3ddff1 clown op fixes 2020-07-22 15:33:24 -05: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
skoglol
a8e83674f9 Merge pull request #52354 from Timberpoes/deaf-revenant-feex 
Revenants can now hear again (Fixes #52325)
 2020-07-21 17:50:39 +02:00
ShizCalev
4b6500fb67 Makes all anchored changes use setAnchored(), COMSIG_MOVABLE_SETANCHORED now only sent if an AM's anchored var has changed for more reliable usage. (#52254) 
* Converts everything to use setAnchored() + other fixes

* Fixed singulo debug

* singulo again

* forgot to move the vv_edit proc

* caught that this time :)

* changes

* Update code/game/atoms_movable.dm

Co-authored-by: Rohesie <rohesie@gmail.com>

Co-authored-by: Rohesie <rohesie@gmail.com>
 2020-07-21 02:20:26 -03:00
spookydonut
d17080167c Fix leading slashes and turn on linting for it 2020-07-21 13:02:04 +08:00
EdgeLordExe
d4545c40a3 ashies (#52080) 2020-07-20 11:50:26 -03:00
MrMelbert
789aa2b6ba Adds an item proc for accidental consumption and implements it in food containers (bread, cake, cheese) (#51925) 
* cronch monch ow, i'm dyin bros

* oopsies

* also should've removed that

* first round of fixes, thanks bros

* fk

* Some post cleanup

* ?

* if-else begone

* gotta sweep sweep sweep

* proper math

* Update code/modules/projectiles/ammunition/_ammunition.dm

Co-authored-by: ラッピ from PSO2 <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>
 2020-07-20 09:40:46 -04:00
Timberpoes
b52c5d3291 Actually feex. 2020-07-20 02:48:32 +01:00
Timberpoes
5ec3816c53 Revenants no longer overwrite all their damn flags, losing the hearing flag. 2020-07-20 02:31:45 +01:00
LemonInTheDark
d3f9b70c0f Adds a message modification packet to saycode to allow for unordered parsing of operator chars, like ;, #, :, or % (#51790) 2020-07-18 18:18:23 +02:00
Ryll-Ryll
40c1b51b97 dunno what to rename this 2020-07-16 21:53:56 -04:00
Ryll-Ryll
1f31064c3e Merge remote-tracking branch 'tgstation/master' into who-named-this-damned-proc 2020-07-16 21:43:14 -04:00
Aleksej Komarov
0cf00a2645 tgui 4.0 (#52085) 
* tgui 4.0 hyper squash

* Upgrade dependencies
 2020-07-16 20:13:04 +02:00
skoglol
0b8d4e060d Merge pull request #52231 from ShizCalev/cult-rune-reveal-fix 
Fixes cultist reveal rune ability breaking when used over a cult engine turf without a fake appearance.
 2020-07-16 08:52:07 +02:00
jdawg1290
62676e72a8 Force LF line endings with gitattributes and convert repo (#52266) 
Co-authored-by: Aleksej Komarov <stylemistake@gmail.com>
 2020-07-16 03:02:40 +03:00
ShizCalev
982c4d1148 Fixes Factory Error Synths not getting their glowy eyes (#52194) 2020-07-14 20:15:06 -04:00
ShizCalev
e354594f2d Fixes being able to hide your codex while gathering research points (#52206) 2020-07-14 20:11:42 -04:00
Jared-Fogle
ee5b005007 Add tests for outfits, fixes families outfits, Syndicate Ship Captain, and armored bounty hunters (#52210) 
* Add tests for outfits, fixes families outfits and Syndicate Ship Captain

* Switch out captain uniform from tacticool to combat

* Consistent styling

* My weakness is I'm a pedant

* Check left and right pockets, and fix armored bounty hunter
 2020-07-14 20:06:11 -04:00
ShizCalev
85cbf06b7d early return 2020-07-14 03:14:02 -04:00
ShizCalev
7ba26bcbdc Fixes cultist rune reveal not working 2020-07-14 03:05:09 -04:00
skoglol
61c3774b4b Merge pull request #52064 from MrDoomBringer/supplyreturnpod 
The Supplypod Renaissance Part 4: Admins can get/send/teleport things around easily with the power of supplypods!
 2020-07-13 10:30:06 +02:00
MrDoomBringer
f50177e6b0 man i hope i won't have to rebuild tgui 30 times 
To Fikou


fixes stealthpods


critical bugfix


i hoped wrong


fixies


accdiently enabled a unit test lmao


fixes and wixes
 2020-07-12 23:04:59 -04:00
LemonInTheDark
dbdb2d33fe Merge conflict begone 2020-07-12 17:37:14 -07:00
skoglol
c5026e8f31 Merge pull request #52140 from LoserWasTaken/crazy 
blood cleave nerf
 2020-07-12 13:54:06 +02:00
skoglol
06c5a7afdf Merge pull request #51854 from MrDoomBringer/supplyprettypod 
Please check out this EPIC OFFICIAL PR TRAILER before reading (very important)
https://youtu.be/4RckVdx20oQ
the video is kinda autistic

dont forget to upvote
About The Pull Request

All sprites and epic meme videos made with love by yours truly
Except for the 2 missile sprites. Those were taken and modified from NSV13 who in turn ported them from TGMC
nupod_all_decals

Anyways, this adds:
New pod, reverse-pod, and target indicator sprites
Pod-ground collision effects (impact craters basically)
Cool looking vapor trails a la the half-life 2 headcrab shells

And also:
Fixes seethrough pods not actually working
Makes reverse-mode a bit more predictable
Has some minor code improvements with how supplypod-reverse-mode works
 2020-07-12 13:24:37 +02:00
skoglol
6bcb653a5f Merge pull request #52049 from EdgeLordExe/hbalancing6 
HERETICS : makes ascension automatically greentext if you do it.
 2020-07-12 12:41:07 +02:00
Ryll-Ryll
7f15be7f68 Merge branch 'master' into who-named-this-damned-proc 2020-07-11 23:30:49 -04:00
Ryll-Ryll
fc0b247738 rename 2020-07-11 23:23:23 -04:00
Wayland-Smithy
6f47ac7606 BLOB: Makes placing Resource and Factory Blobs require a blob_allowed area (#52119) 
* Encourage blobs to stay on the station

* Fix space blob node bait
 2020-07-12 03:30:06 +10:00
EdgeLordExe
05924db0d5 Speedmerge, voiceless ritual makes the ghouls INVISBLE_ABSTRACT, while they are alive, well and moving (#52135) 
* AAAAASPEEDMERGE

* E

* deep
 2020-07-12 03:11:21 +10:00
Tümer Türkmen
fae05cfdfb stupid idea 2020-07-10 14:50:15 +03:00
skoglol
c0e123aba2 Merge pull request #51999 from EdgeLordExe/hbalancing4 
HERETICS : fixes an infinite summons exploit.
 2020-07-09 16:00:09 +02:00
LemonInTheDark
f59207ec83 Converts rad_flags to flags_1, holy shit why 2020-07-09 00:20:46 -07:00
LemonInTheDark
c87583007f Splits TRAIT_RADIMMUNE into one trait that prevents radiation damage, and one that prevents genetic mutation TRAIT_GENELESS 2020-07-08 22:59:19 -07: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
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
Wayland-Smithy
d635d3cf38 the truth menaces with spines 2020-07-07 21:58:28 -04:00