Commit Graph

25994 Commits

Author SHA1 Message Date
silicons 31beb2dd62 Update colormate.dm 2020-12-13 06:41:40 -07:00
silicons 28a0725bd8 Update colormate.dm 2020-12-13 06:36:20 -07:00
silicons 4b20d26d2b Merge remote-tracking branch 'citadel/master' into colormates 2020-12-12 01:56:37 -07:00
silicons c2727ca278 Merge pull request #13743 from Linzolle/thunderdome
thunderdome entertainment monitors fix + stuff
2020-12-12 01:55:53 -07:00
silicons fab40166d3 Merge pull request #13737 from qwertyquerty/flash
Flash the screen on climax
2020-12-12 01:52:17 -07:00
Putnam3145 f0e51d666c Merge pull request #13617 from timothyteakettle/loadout-json
loadout 2: electric boogaloo
2020-12-11 18:11:56 -08:00
DeltaFire e1bf6b94f9 Merge pull request #13747 from MrJWhit/thicc-fuel-tanks
Porting to the /tg/ sprite changes, and functionality, of large reagent containers
2020-12-11 22:38:18 +01:00
Lin c1fee8e5c4 Merge pull request #13739 from timothyteakettle/tongue-and-eyes
custom eyes and tongues now properly carry across cloning
2020-12-11 16:59:05 +00:00
Lin 4077537d45 Merge pull request #13734 from keronshb/Blobreflect-fix
Reflective Blob fix
2020-12-11 16:58:07 +00:00
MrJWhit d10c9db8b2 Update reagent_dispenser.dm 2020-12-11 10:31:42 -05:00
silicons 3f4702a99c done 2020-12-11 05:52:09 -07:00
silicons e27c843296 fixes 2020-12-11 05:35:57 -07:00
silicons 90608e8cfd ok 2020-12-11 05:21:27 -07:00
silicons c70d7a24e0 fixes 2020-12-11 05:14:38 -07:00
silicons 317f33b4e5 fixes 2020-12-11 05:14:23 -07:00
silicons 13391d2af6 fix 2020-12-11 05:09:29 -07:00
silicons 599a1f0419 fix 2020-12-11 05:06:44 -07:00
silicons 76e7caad33 colormates 2020-12-11 04:54:30 -07:00
DeltaFire bece5971b8 Merge pull request #13745 from Arturlang/soulstone_references
Adds more sanity to construct soul returning
2020-12-11 00:42:30 +01:00
keronshb 07b56e1542 Adds new line
new line added
2020-12-10 15:29:13 -05:00
MrJWhit 477330197c Huh we already had this 2020-12-10 01:14:43 -05:00
silicons a4e6df8f9a Merge pull request #13738 from DeltaFire15/heretic-tweaks
Updates the heretics gamemode with a bunch of changes from /tg/
2020-12-09 21:47:46 -07:00
silicons 821c3becc3 Merge pull request #13704 from Putnam3145/make-emotes-local
Makes emotes show up in the "local" filter with TGUI
2020-12-09 21:47:06 -07:00
tgstation-server 5b74596d72 Update TGS DMAPI 2020-12-10 00:47:22 +00:00
Artur ef13b07dd4 Forgot this 2020-12-09 17:56:28 +02:00
Artur 827920dba7 Paranoid ramblings 2020-12-09 17:54:44 +02:00
Linzolle 0ddc053a8b what if mapmerge worked 2020-12-08 17:35:21 -06:00
Linzolle 3e951d334c fix entertainment monitors 2020-12-08 17:21:14 -06:00
Timothy Teakettle 132a3c9526 color non polychromic items 2020-12-08 19:29:34 +00:00
DeltaFire 69a1d6e603 oop 2020-12-08 16:32:34 +01:00
DeltaFire 86661a4fe0 aaaaaaaaaaaaaa 2020-12-08 16:30:09 +01:00
Lin e38543ae48 Merge pull request #13736 from DeltaFire15/abductor-surgery-robotstuff
Makes the experimental organ replacement surgery work on robots
2020-12-07 23:18:35 +00:00
timothyteakettle 43df7462d5 copy from old species 2020-12-07 23:03:28 +00:00
Timothy Teakettle 8846e69c42 ANOTHER ONE 2020-12-07 21:34:52 +00:00
Timothy Teakettle ac9e383638 WOOPS ONE MORE DEBUG MESSAGE 2020-12-07 21:28:17 +00:00
DeltaFire b186ec96ad rune invisible to sillycones. 2020-12-07 22:19:30 +01:00
DeltaFire 73d3234882 buncha changes 2020-12-07 22:15:04 +01:00
DeltaFire 33e4486c53 Merge remote-tracking branch 'upstream/master' into heretic-tweaks 2020-12-07 21:18:11 +01:00
timothyteakettle 81eaa8a2b9 woops 2020-12-06 23:51:03 +00:00
timothyteakettle 16b98adb9f no more debug 2020-12-06 23:40:00 +00:00
timothyteakettle a84f1648f4 Update preferences_savefile.dm 2020-12-06 22:57:57 +00:00
Timothy Teakettle e413fcb091 more fixes 2020-12-06 22:14:35 +00:00
Lin d2949c64db Merge pull request #13728 from Citadel-Station-13/silicons-patch-12
adds 8 save slots
2020-12-06 22:10:48 +00:00
Timothy Teakettle 53a434cfb1 suggested change 2020-12-06 20:07:50 +00:00
qwerty 74c30dc3c1 better time length 2020-12-06 13:13:53 -06:00
qwerty 851f9afa20 bugfixes 2020-12-06 13:08:18 -06:00
qwerty 29141ba97d flash on climax 2020-12-06 12:36:30 -06:00
timothyteakettle 61cc33d995 Merge remote-tracking branch 'upstream/master' into loadout-json 2020-12-06 17:26:04 +00:00
timothyteakettle 0f540884eb Merge branch 'master' into loadout-json 2020-12-06 17:24:24 +00:00
timothyteakettle 5566c00a69 fixes 2020-12-06 17:24:12 +00:00