Commit Graph

26370 Commits

Author SHA1 Message Date
Putnam 558d11bc73 Stringified the vote #defines for easier config stuff 2020-10-18 14:49:43 -07:00
Timothy Teakettle f5cc216a4c travis segfaulted 2020-10-18 21:51:58 +01:00
Timothy Teakettle c53eeff33f travis segfaulted 2020-10-18 21:51:36 +01:00
Timothy Teakettle f965b78960 remove debug messages 2020-10-18 21:36:51 +01:00
Timothy Teakettle 8e2345d2f7 FUCK 2020-10-18 21:36:17 +01:00
Timothy Teakettle 2ac3bbbaf3 fix 2020-10-18 21:09:20 +01:00
Putnam 07a02617c2 Fixed compiler errors, runtimes 2020-10-18 12:51:00 -07:00
Putnam 00b4d207c5 Added ranked choice ballots to stat voting. 2020-10-18 12:32:45 -07:00
Timothy Teakettle bb46fa319c fix 2020-10-18 18:34:07 +01:00
Timothy Teakettle bfb3546ccc save/load 2020-10-18 18:16:29 +01:00
Timothy Teakettle 40efc4b8c8 cleanup and migration fix 2020-10-18 18:05:59 +01:00
Timothy Teakettle 861f225f2d trader fix 2020-10-18 03:25:17 +01:00
Timothy Teakettle 87387f45d1 fixes 2020-10-17 23:32:08 +01:00
Timothy Teakettle 5e780064c1 fixes and a toggle 2020-10-17 19:47:46 +01:00
silicons 44dc292101 Update preferences_savefile.dm (#13557) 2020-10-17 13:58:33 +02:00
Zandario fcd8fec815 Fixes an oversight and updates some defines (#13558) 2020-10-17 12:37:58 +02:00
Putnam3145 f6b93a242c Makes get_damaged_bodyparts use proper arguments (#13570)
* you're not being clever, you're being obfuscatory, stop this

* Made get_damaged_bodyparts use proper arguments

* Actually shouldn't have the arg
2020-10-17 11:44:15 +02:00
DeltaFire15 ca21572aa7 Fixes vamp shapeshifting a bit (#13562)
* fixes vamp shapeshifting a bit

Title. Buncha weird stuff happening.

* ghom's request

moves the check to ../bat/cast(), adds type safety
2020-10-17 11:39:58 +02:00
MrJWhit 4fdacf0560 Porting putnams ventcrawling PR and Fix (#13571)
* Porting putnams rage

* And the bugfix
2020-10-17 11:39:25 +02:00
silicons f16343d726 Update squeak.dm 2020-10-16 20:48:11 -07:00
timothyteakettle 04e1d9fc39 more fixes 2020-10-17 03:42:14 +01:00
timothyteakettle d5a1834788 more fixes 2020-10-17 01:40:02 +01:00
timothyteakettle 4f5465c39e fixes 2020-10-17 01:00:04 +01:00
Timothy Teakettle 2c6e8fd87d what if color was cool 2020-10-16 22:28:00 +01:00
Putnam3145 099a82b936 Made fermichem displays work correctly. (#13577) 2020-10-16 22:27:37 +02:00
DeltaFire fd680132ca little tweaks
reality smash: completely invisible

broken illusion: shows after some time, invisible to silicons (like cult runes and some other stuff are)
2020-10-16 21:12:27 +02:00
Ghom b893e40494 Update gasmask.dm 2020-10-16 20:57:08 +02:00
Ghommie c0f3317c01 mime/clown masks' face concealment altclick toggle. Plasmaman helmets' welding visors & smileys port. 2020-10-16 20:27:09 +02:00
BlueWildrose a134bedd4c Fixes subtle hotkey, adds subtler hotkey (#13575) 2020-10-16 17:22:35 +02:00
Timothy Teakettle c649dbe6c6 better taurs 2020-10-15 23:04:55 +01:00
Sonic121x 989962172a Update miscellaneous.dm 2020-10-16 04:38:42 +08:00
Sonic121x e537828f5a Update eldritch_items.dm 2020-10-16 03:56:47 +08:00
Sonic121x f8e0171776 Update miscellaneous.dm 2020-10-16 03:55:29 +08:00
Sonic121x 566e1ba590 Update jobs.dm 2020-10-16 03:52:59 +08:00
Sonic121x 1a04ee2125 Update labcoat.dm 2020-10-16 03:43:15 +08:00
Timothy Teakettle 37030baa70 Merge remote-tracking branch 'upstream/master' into loadout-json 2020-10-15 20:05:56 +01:00
Timothy Teakettle f337061c51 more defines 2020-10-15 20:05:39 +01:00
Putnam f0d5c65ef1 Removes the surgery unit test so travis stops randomly failing. 2020-10-15 11:54:03 -07:00
silicons c3cdeb0507 fixes movespeed configurations (#13555)
* Update config_entry.dm

* Update game_options.dm

* Update config_entry.dm

* Update code/controllers/configuration/config_entry.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-10-15 13:53:21 +02:00
Putnam3145 bcf697e8d7 Fixes a race condition in the surgery unit test that causes it to fail at random (#13552)
* Fixes a race condition in the surgery unit test

* Increases the sleep a bit.
2020-10-15 13:38:49 +02:00
Vynzill cbe9f6c12a makes eyes glow once again with high luminosity (#13554) 2020-10-15 13:37:09 +02:00
BlueWildrose 6080253759 Fixes cloning computer UI not updating when pressing certain buttons - also adds extra check for names to update a message (#13549)
* fixes cloning computer UI not updating when pressing certain buttons

* forgot a few things
2020-10-15 12:54:22 +02:00
DeltaFire15 1e1a92983a [s] Objective fixes : Cryo edition (#13561)
* no more free wins from cryo

* Kicks travis with an empty commit

* Update code/game/gamemodes/objective.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-10-15 12:44:08 +02:00
Timothy Teakettle 8287005dd5 does what it says on the title (#13563) 2020-10-15 11:49:05 +02:00
zeroisthebiggay ea80867cda Update legion.dm (#13566) 2020-10-15 11:48:12 +02:00
silicons d31381596f Update datum_pipeline.dm 2020-10-14 00:41:21 -07:00
silicons f6f5f7f4d0 Update datum_pipeline.dm 2020-10-13 16:49:12 -07:00
timothyteakettle 23bc1476ea its real slime leg hours 2020-10-13 23:46:32 +01:00
silicons d148ac2aab Merge pull request #13529 from Putnam3145/superconductivity-planets
Makes planetary atmos no longer superconduct
2020-10-13 11:53:11 -07:00
silicons 1bab47bafb Update ooc.dm 2020-10-12 12:33:27 -07:00