Commit Graph

30051 Commits

Author SHA1 Message Date
Paxilmaniac 48e6db2fbc makes space pods (and earmuffs) make you deaf
i guess i can make earmuffs actually work while im at it
2020-01-13 19:44:41 -08:00
Paxilmaniac b8b2d23616 Revert "space pods damage your ears"
This reverts commit ee400cbcb4.
2020-01-12 12:00:02 -08:00
Paxilmaniac ee400cbcb4 space pods damage your ears
TURN YOUR FUCKING RAP MUSIC VOLUME DOWN
2020-01-12 11:37:57 -08:00
Paxilmaniac f3d037929c subtypes are very cool
hi x2
2020-01-11 20:49:40 -08:00
Paxilmaniac 191d3f06c3 Merge remote-tracking branch 'master/air-pods' into air-pods 2020-01-11 20:31:14 -08:00
Paxilmaniac 3cb2161e4e probably fixes that giant fucking runtime
maybe
2020-01-11 20:31:05 -08:00
Paxilmaniac 51892382dd people can still hear your music when you are wearing airpods, especially that one guy that has his rap music at like 9000 Db
custom_premium_price is cool
2020-01-11 20:13:10 -08:00
Paxilmaniac 8afbb99c72 oh god oh fuck i cant hear anymore
hi
2020-01-11 19:19:36 -08:00
Paxilmaniac 6d09cfb5a0 adds nanotrasen space pods
not those shitty space travel things, they are actually offbrand airpods
2020-01-11 19:00:16 -08:00
Fikou 8eee742734 [Ready] Adds ERP (#48699)
Adds a new emergency response team, the ERP! It stands for Emergency Response Party

the ERP includes:
-the coordinator: basically the captain of the operation, armed with a birthday cake, balloon and lots of fireworks to start the celebration
-the bouncer: the big boy, has a telebaton and an armor vest (if youre a loser you get a police hat too)
-the constructor: has tools, materials to build the party, disco tiles and an ethereal disco ball planter
-the cleaning service: your normal jannie, with his trusty mop, trash bag and cleaning grenades
-the comedian: a clown, armed with instruments, a bananium shield and chameleon suit/hat, for some comedy at the party
2020-01-12 13:31:13 +13:00
skoglol 03b4540cbc Merge pull request #48708 from ExcessiveUseOfCobblestone/im-not-new-ok
Waypoint Finders now properly pull living playtime
2020-01-11 05:41:03 +01:00
actioninja 118b95dacf mulebot fix 2020-01-10 20:05:13 -08:00
actioninja db161a7570 Roulette Machine
initial work

more work

more roulette work

more work

more

yet more

FINALLY

small fixes

use global colors for last spun box

no low memory mode

cleanup

nuke old roulette assets

kills remaining 2 usages

forgot this var
2020-01-10 20:05:11 -08:00
skoglol 51236f08db Merge pull request #48613 from MarioWizard119/patch-1
Dark mode chat color tweaks
2020-01-11 03:52:58 +01:00
Unknown 58a2dcadbe a 2020-01-10 14:06:35 +01:00
LemonInTheDark f4f8a686df Makes grounding rods consistent, changes the supermatters bolts a great deal. (#48472)
* Goof I will find you and I will berate you

holy hell

Calm and peaceful ahhhhh

I swear goofs pc failing was the biggest tragedy in gaming

Fixes some flags

More touchups

Now to squash

Goofs PC failing was the biggest tragady in GAMING

* Fixing some misspellings before the bee gets me

* GOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF

* Full vehicle support

* Changes some flags around, "fixes" some bugs, makes being shocked less insane

* Makes spliting more reasonable, unfucks some shitty tesla code I copypasta'd into the sm, godspeed shitcode,
none noticed you.

* Removes my tesla_ignore_1 fix, another pr is up that should solve things, so we're just leaving it in for now,
gonna have to deal with merge conflicts when it gets merged, but that won't be too bad

* tfw

* Nothing to see here folks

* I'm a boomer
2020-01-10 23:25:11 +11:00
ArcaneMusic bf2d1b82fd Adds a new BEPIS Major Reward, "Australicus Security Protocols" (#48600)
* The hero returns alive.

* Initial commit, boomerang batons and outback firing pins.

* Australicus is the lore in the game already, so #@$! it we'll pretend like #lore_general exists

* Name tweak.

* Fixes boomerang name, Inhands, accidently included a leftover sprite.
2020-01-10 23:17:17 +11:00
wesoda25 030303d952 Ethereals now discharge electricity if their charge is too high (#48573)
* if this works i will be happy

* :(

* explosion

* brutemod

* george melons
2020-01-10 23:14:41 +11:00
Jordie 637e07c081 Merge pull request #48604 from SteelSlayer/signaler-tgui-next
tgui-next: Remote signalers
2020-01-10 23:08:04 +11:00
Bobbahbrown 0b32b5c938 Format Change of Health Analyzers + scanners.dm Cleanup (#48595)
* VERY cool no more stink (less)

* LIST GAAANGLIST GAAANGLIST GAAANGLIST GAAANGLIST GAAANGLIST GAAANG
2020-01-10 22:59:47 +11:00
Ghom f94fb3f578 Fixes Light Eater not overloading borg lamps. (#48640)
* Fixes Light Eater not overloading borg lamps.

* How to fool light eater's infinite lamp cooldown: flash yourself or take a nap. 👏

* I'm an idiot.
2020-01-10 22:30:23 +11:00
Jordie 3ef6beb0d9 Merge pull request #48637 from Ghommie/Ghommie-tg14
Fixes traitor codewords highlight and some other hear signal hooks.
2020-01-10 22:26:18 +11:00
Ghom c5b5d96130 Just a few dullahans fixes. And no, it doesn't fix headless monkys yet. (#48633)
* A few dullahans fixes and QoL.

* Binary operators.
2020-01-10 22:21:20 +11:00
Arkatos1 7b543d2cf9 Valentine status effect fix (#48615)
* Automatic TGUI Rebuild [ci skip]

* Valentine fix

* Revert "Automatic TGUI Rebuild [ci skip]"

This reverts commit 0a92762a259c447b1486cef3a8a6d493dea2039b.

* Review fixes
2020-01-10 22:18:26 +11:00
Nick 63b9cf1e7a [Ready]Adds fireworks to contrabrand lootpool(WE SMUGGLIN FIREWORKS BOIS) (#48658)
* Update packs.dm

* Makes it normal

* Update packs.dm
2020-01-10 22:09:54 +11:00
Dorsisdwarf 051c421c45 Updates the Limb Grower (#48678)
* Updates limbgrower

removes fly parts, adds ethereal parts, adds lizard tails, fixes random coloring

* adds newline at end to remain compatible with other pr

* Removes lizard tails

By popular request
2020-01-10 21:39:08 +11:00
LemonInTheDark a4e2d17a42 Makes SM's radiation behave correctly (#48691)
* https://www.youtube.com/watch?v=RbFpDJsLYOU Should fix some shitcode and unintended behavior

* A classic of our times

* maxing to 0 so we don't get hell sm's

* typo

Co-authored-by: Jordie <4343468+Jordie0608@users.noreply.github.com>
2020-01-10 21:23:55 +11:00
Jordie f6ae7bfa60 Merge pull request #48686 from Arkatos1/MimingFix
Mime drinks now check if you are true mime before healing
2020-01-10 21:19:47 +11:00
Jordie 09bb6a3e84 Merge pull request #48694 from Fhaxaris/turfmovespeed
Flying/Floating mobs no longer affected by turf move-speed modifier.
2020-01-10 20:42:04 +11:00
MarioWizard119 94d0a73488 I swear I’m blind 2020-01-09 23:48:25 -06:00
ExcessiveUseOfCobblestone fe40dfea6e b 2020-01-09 22:29:50 -05:00
AnturK 6a62a139a8 Basic auto profiler (#48672)
* Basic auto profiler

* Makes it update periodically in case of crash.

* informative comment.

* Early start & config upgrades.

* Fixup
2020-01-09 19:32:57 -05:00
Arkatos1 fb416d9f10 Simple mob alerts (#48646)
Simple mob alerts
2020-01-09 05:53:57 -08:00
WarlockD 12def0c116 Fixed damage sensor nanite (#48664)
Fix nanite damage sensor and rule, take 2 #48564
2020-01-09 05:53:29 -08:00
Twaticus b098edd11a nae nae attempt 3 (#48656)
Inhand sprites for whips
2020-01-09 05:49:52 -08:00
spessbandit 6119bc141d More spelling/grammar fixes. (#48657)
More spelling/grammar fixes.
2020-01-09 05:49:09 -08:00
fhaxaris 53e1cad39b Flying/Floating mobs no longer affected by turf move-speed modifier. 2020-01-08 22:53:55 -06:00
ShizCalev 82642e2f6a Merge pull request #48681 from Arkatos1/SpriteCleanup
Adds several missing sprites for clothing items
2020-01-08 23:34:48 -05:00
Arkatos 4e91dae0d1 Miming check 2020-01-08 21:42:43 +01:00
Emmett Gaines 53024590de Can pass refactor (#48659)
* Makes all CanPass procs call parent

* Makes CanPass more extendable and gives the mover a say in the matter

* Replace CanPass with CanAllowThrough to use the new system

Regex replace `(?<!proc)/CanPass\(` => `/CanAllowThrough(`

* Simple optimization pass
2020-01-08 21:31:49 +01:00
Arkatos 849ff29efb More duplicates removed, the rest of items fron issue fixed 2020-01-08 18:26:59 +01:00
skoglol 16dd9a74ac Merge pull request #48517 from SteelSlayer/sm-arcs
Changes the sprite of the supermatter's electricity arcs
2020-01-08 11:25:00 +01:00
skoglol c471f51dff Merge pull request #48647 from ShizCalev/tesla-shock-refund-fix
Fixes tesla immunity being lost if you have reactive armor and refund the lighting bolt spell / vice versa
2020-01-08 11:17:00 +01:00
skoglol decb6887f2 Merge pull request #48651 from carshalash/master
Local bartender exterminates rare endangered albino grasshopper. Typo fix.
2020-01-08 08:09:23 +01:00
SteelSlayer ea03430102 Merge remote-tracking branch 'upstream/master' into signaler-tgui-next 2020-01-07 11:54:16 -06:00
SteelSlayer 22ccb3b336 Coverted UI over to use <Table> for aesthetic reasons 2020-01-07 11:51:09 -06:00
Qustinnus 8337ccac44 Fixes integrity issues related to datum mats (#48586) 2020-01-07 10:02:18 -05:00
skoglol 135251ece3 Fixes admin disease naming, basic disease trigger (#48628) 2020-01-07 09:54:55 -05:00
skoglol 8206b1e1cb Map rotation touchup, automatic map votes (#48602)
* Map rotation touchup, automatic map votes

* votes already running

* Pre-init vote restrictions

* No rotation for rounds less than 10 minutes.

* Splits voting preferred map check

* Fixed comment
2020-01-07 09:46:49 -05:00
Arkatos1 c1d0fe6f6b Headrev HUD fix (#48611)
* Automatic TGUI Rebuild [ci skip]

* Headrev HUD fix

* Revert "Automatic TGUI Rebuild [ci skip]"

This reverts commit 5b949eb972214592336399612e10eb812c762960.

* Proper order and cleanup

* Clean solution

* Second bugfix
2020-01-07 12:03:22 +01:00