Commit Graph

18489 Commits

Author SHA1 Message Date
Kurfursten
66e831a19b Forgotten Flatpacks (#26414) 2020-05-12 11:23:32 -03:00
Kurfursten
0d7687bcc3 Merge pull request #26437 from BomberBro/inhandupdates
Adds a bunch of in-hand icons
2020-05-12 09:10:19 -05:00
Kurfursten
f6c876489f Mechanic Clubhouse Vault (#26427)
* Oh god I hope I'm doing this right oh jeez oh man

* Fixed the map breaking if anyone at any point uses an "A" for anything
Also actually added it to the thing that makes vaults load which is important.

Co-authored-by: GreatBigFailure <Questionfrog@gmail.com>
2020-05-12 09:10:07 -05:00
RaccoonBro
dd074cc866 Keycard Authenticator Devices have no delay and now provide actual feedback. (#26425)
* Makes keycard authenticators more usable

* ridding spanners

* feels like MySpace all over again

* You can now use PDAs on keycard devices

* Update keycard authentication.dm

Co-authored-by: DamianX <DamianX@users.noreply.github.com>

Co-authored-by: DamianX <DamianX@users.noreply.github.com>
2020-05-12 09:09:25 -05:00
Krimsonkhan
e143488d1a AI mention alerts and intercom settings copy/pasting (#26333)
* Copy/pasting of intercom settings

* AI alerts

* Alerts for AI name as well

* Added mention toggle verb. Switched highlight to blue.
2020-05-12 09:02:28 -05:00
aceedex
12d7963d04 Adds lobsters, lobster dishes and condiments (#26226)
* Makes lobster

* Makes lobster

* Makes lobster

* Makes lobster

* Makes lobster

* Makes lobster

* Makes lobster

Co-authored-by: aceedex <repetto1995@gmail.com>
2020-05-12 09:00:00 -05:00
GreatBigFailure
92e24e109b Fixed the map breaking if anyone at any point uses an "A" for anything
Also actually added it to the thing that makes vaults load which is important.
2020-05-11 00:29:14 -04:00
Bomber Harris
cf03514a81 adds inhands 2020-05-10 17:29:59 -04:00
Kurfursten
9867343a91 More Trader Stuff (#26346)
* More Trader Stuff

* updates
2020-05-10 05:11:41 +02:00
Kurfursten
844a05c6ea It's Party Time (#26430)
* It's Party Time

* ready
2020-05-09 15:20:48 -04:00
D3athrow
459b56743b Fixes #26429 2020-05-09 12:18:28 -05:00
GreatBigFailure
672986548b Oh god I hope I'm doing this right oh jeez oh man 2020-05-09 02:25:18 -04:00
ShiftyRail
60dd7ab10c Removes a duplicate timestemp in ahelps (#26421) 2020-05-08 22:28:14 +02:00
DamianX
a7af778252 Fuck this code so much holy shit (#26356) 2020-05-08 14:57:32 +02:00
DamianX
a01b6db34f Fixed poppy pretzel recipe only accepting vending machine seeds (#26323) 2020-05-08 06:25:26 -03:00
Kurfursten
081491eb11 Pocket Satellite (#26363)
* Pocket Satellite

* cleaned up code, added new sprite

* Circle

* lines
2020-05-07 22:59:44 -03:00
adrian
f1e9cf5c40 Allows a delta malf AI to recall the shuttle (#26286)
* Allows a delta malf AI to recall the shuttle

* formatting

* New error message
2020-05-07 18:41:14 -05:00
Exxion
3835445ab8 Fixes paper bins making ashes forever (#26401) 2020-05-07 01:18:53 -03:00
ShiftyRail
5faec6622a Fix another hair-clipping-through-helmet bug (#26376) 2020-05-07 03:27:27 +02:00
adrian
a16c4e1e15 Adds ghost spells (#26384)
* Adds ghost spells

* no

* forgot the dmi

* actually let's name it

* new hide sprite icon_state
2020-05-07 03:27:08 +02:00
boy2mantwicethefam
48f3c8ae91 Adds experimental syndie gear box (#26271)
* 1 (and possibly a bug where you cant switch items in your hands)

* Finishing this

* super honk

* fixes bundle not spawning anything

* fixes conflicts
2020-05-06 08:32:35 -05:00
adrian
f2c56e0959 Max cap on map persistence (#26402)
* Max cap on map persistence

* The dangers of copypasting
2020-05-06 13:27:22 +02:00
Kurfursten
ea104776b0 Hunting Rifle (#26367)
* Hunting Rifle

* and make scopes too
2020-05-05 08:17:42 -03:00
Kurfursten
3f9592e898 Skin Dye (#26345)
* Skin Dye

* var

* no as

* flags

* more
2020-05-05 11:16:31 +02:00
boy2mantwicethefam
397e7aadc2 apparently this isn't a thing (#26332) 2020-05-04 16:37:51 -03:00
ShiftyRail
5ffa4a488b Revert "It Just Works (#26371)" (#26391)
This reverts commit b3cbc1cbbc.
2020-05-04 15:27:34 -04:00
Exxion
b3cbc1cbbc It Just Works (#26371) 2020-05-04 19:59:12 +02:00
DamianX
043035f436 Fixed secret fake alert button (#26373) 2020-05-04 07:55:52 -03:00
Kurfursten
6275c91fb2 Therapy Couch (#26369) 2020-05-04 07:32:26 -03:00
DamianX
403602b9ad Fixed flamethrowers not throwing flames (#26386) 2020-05-04 09:44:58 +02:00
D3athrow
e02693f315 Make pregame lobby message ping people that care 2020-05-03 17:34:45 -05:00
DamianX
5399c3b0f3 Fixed a bunch of linter warnings (#26360)
* Fixed a bunch of linter warnings

* Fix everything, maybe break something

* Fixed Time Stop not being cast by Arcane Golems

* Fixed arguments of remove_from_storage

* Fixed gun/afterattack arguments

* Fixed gun/Fire arguments

* Fixed arguments to candle/light and mob/emote

* Fixed arguments to simple_animal/revive, simple_animal/gib, robot/drop_item, mob/flash_eyes
2020-05-03 16:06:40 -03:00
Kurfursten
ed26a73f70 Merge pull request #26285 from RealestEstate/mechpaints
Mech Painting
2020-05-02 20:50:47 -05:00
Exxion
610c70f32c Fixes everything breaking when your default language is removed (#26358)
Also Remove() already does that you dingus
2020-05-02 15:39:28 +02:00
Acrylic Mimosa
8b549743d9 exofab, alternate sprites, HUD fixes 2020-04-30 15:05:45 -07:00
Kurfursten
fef708fcae New Mecha Stuff (#26316)
* New Mecha Stuff

* Turns out istypeinlist is bad

* barrycatches

* designs
2020-04-30 10:28:20 +02:00
Kurfursten
6f8d1b2946 Merge pull request #26330 from DamianX/SplatDelay
Fixed thrown pies not immediately going SPLAT
2020-04-29 21:15:06 -05:00
Kurfursten
2aaad9abc6 Merge pull request #26318 from Zth--/cult
Reduces cult endgame from 3 minutes and 20 seconds to 2 minutes
2020-04-29 21:14:42 -05:00
Kurfursten
74306e9516 Merge pull request #26261 from DamianX/Autodeadmin
Added option for admins to deadmin on login
2020-04-29 21:14:30 -05:00
Kurfursten
127417bed1 Merge pull request #26305 from Zth--/goldenslime
Fixes golden extract mimic reaction
2020-04-29 21:12:21 -05:00
Kurfursten
c530b0009a Merge pull request #26274 from bathosbathtime/bathosRocketFix
Fixes Security Rockets
2020-04-29 21:02:19 -05:00
Damian
99188440ed Fixed thrown pies not immediately going SPLAT 2020-04-29 15:13:50 +02:00
bathosbathtime
3809c53870 removes redundent rocket del 2020-04-29 02:27:20 -04:00
bathosbathtime
6f28b8ec21 Rocket Fix Remove Explosive Var 2020-04-28 23:46:41 -04:00
bathosbathtime
11a40d20db Fixes Rockets All 2020-04-28 18:13:09 -04:00
Kurfursten
4c0557b514 Primetime (#26186)
* Primetime

* YOU CAN CLICK IT NOW TOO
2020-04-28 18:29:19 -03:00
ShiftyRail
9ae2db92e8 Add a funny effect to ring of fire (#26289)
* Add a funny effect to ring of fire

* fixes

* removes short-lived fire
2020-04-28 13:41:10 +02:00
zth
0970b37600 git I'm gonna strangle you 2020-04-27 18:17:27 -03:00
Kharkov72
e8901e403c im retarded (#26311) 2020-04-26 14:47:52 -03:00
d3athrow
ce34239798 Merge pull request #26241 from Kharkov72/ya_like_jazz
Adds the Jazz & Swing vinyl
2020-04-26 12:20:17 -05:00