Commit Graph

34479 Commits

Author SHA1 Message Date
Ghom
7513e032e3 petrification improvements (#12375)
* petrification improvements

* Standards.
2020-06-14 23:04:12 -07:00
CitadelStationBot
8ee2f46ca2 Automatic changelog generation for PR #12509 [ci skip] 2020-06-15 01:02:26 -05:00
Timothy Teakettle
6798699b18 slimes can change their body color using alter form (#12509)
* let slimes change their color!

* fix

* let them change hair colour

* Revert "let them change hair colour"

This reverts commit 561bc3d06733fcfee2bae5be819c5a3e57bfc89d.
2020-06-14 23:02:23 -07:00
CitadelStationBot
a436692b4e Automatic changelog generation for PR #12523 [ci skip] 2020-06-15 00:51:36 -05:00
Timothy Teakettle
5df4931266 fix food cart (#12523) 2020-06-14 22:50:16 -07:00
Changelogs
4863c8f467 Automatic changelog compile [ci skip] 2020-06-15 00:07:49 +00:00
CitadelStationBot
c7f6393bda Automatic changelog generation for PR #12516 [ci skip] 2020-06-14 14:54:33 -05:00
Lin
47adbd3e90 Merge pull request #12516 from kevinz000/vv_fix
Fixes VV not allowing proper access to datums in associative lists. Upgrades SDQL2 printout for the 3rd? 4th? 5th? time
2020-06-14 14:54:29 -05:00
CitadelStationBot
0570d5321e Automatic changelog generation for PR #12502 [ci skip] 2020-06-14 14:37:15 -05:00
Lin
894e6c7459 Merge pull request #12502 from kevinz000/shaps_is_once_again_based
Port - Lets you tape knives to cleanbots. You know, if you really want to. #47590/tgstation/Ryll-Ryll
2020-06-14 14:37:10 -05:00
CitadelStationBot
cc3005cecd Automatic changelog generation for PR #12515 [ci skip] 2020-06-14 14:36:07 -05:00
Lin
923cb248d2 Merge pull request #12515 from kevinz000/roomba
Zoombas
2020-06-14 14:36:03 -05:00
CitadelStationBot
21f983c182 Automatic changelog generation for PR #12519 [ci skip] 2020-06-14 14:29:23 -05:00
Lin
bd50f3a143 Merge pull request #12519 from Citadel-Station-13/kevinz000-patch-19
fixes plushies sprite loading
2020-06-14 14:29:19 -05:00
Changelogs
065ca5d2fa Automatic changelog compile [ci skip] 2020-06-14 00:08:42 +00:00
kevinz000
fd076ec7bb Update cleanbot.dm 2020-06-13 16:19:32 -07:00
kevinz000
398651626d Update plushes.dm 2020-06-13 13:31:33 -07:00
kevinz000
6230e11f16 Update plushes.dm 2020-06-13 13:19:32 -07:00
kevinz000
278dfab74a Update plushes.dm 2020-06-13 13:10:14 -07:00
kevinz000
6f1dd34c91 Update plushes.dm 2020-06-13 11:57:11 -07:00
CitadelStationBot
4a59066e43 Automatic changelog generation for PR #12505 [ci skip] 2020-06-12 21:28:35 -05:00
Lin
d73b2b8635 Merge pull request #12505 from deathride58/morelgbtholidays
Adds more LGBTQIA+ related holidays
2020-06-12 21:28:32 -05:00
CitadelStationBot
7a831f5512 Automatic changelog generation for PR #12510 [ci skip] 2020-06-12 21:27:07 -05:00
Ghom
834432d59f Merge pull request #12510 from TheObserver-sys/Finally!AUseForPeas!
Finally, A use for peas!
2020-06-13 04:27:04 +02:00
CitadelStationBot
a9b979ce90 Automatic changelog generation for PR #12514 [ci skip] 2020-06-12 21:25:53 -05:00
Ghom
67c9ff4026 Merge pull request #12514 from Citadel-Station-13/kevinz000-patch-18-1
the abstract idea of shadows can no longer be radioactive
2020-06-13 04:25:50 +02:00
kevinz000
3dbfc6ddf2 better support 2020-06-12 18:50:57 -07:00
kevinz000
9a08623308 sigh 2020-06-12 18:39:45 -07:00
kevinz000
e2aab5c1a5 css is really hard folks 2020-06-12 18:01:53 -07:00
kevinz000
e1a1dc61f6 this is ugly and i hate it 2020-06-12 17:50:23 -07:00
kevinz000
78e153cbe4 is this better 2020-06-12 17:32:17 -07:00
kevinz000
8e6dee515a null isn't an object 2020-06-12 17:16:36 -07:00
kevinz000
be6ea51f19 closing 2020-06-12 17:11:29 -07:00
CitadelStationBot
f6ebb0b1c3 Automatic changelog generation for PR #12498 [ci skip] 2020-06-12 19:08:13 -05:00
Ghom
77c428479e changes the inefficient attack message string and threshold. (#12498) 2020-06-12 17:08:10 -07:00
CitadelStationBot
584a1428d5 Automatic changelog generation for PR #12503 [ci skip] 2020-06-12 19:08:03 -05:00
Ghom
37294fd4b7 Fixing wrong helmet type for old beserker hardsuit (#12503) 2020-06-12 17:07:59 -07:00
CitadelStationBot
c32b0387db Automatic changelog generation for PR #12506 [ci skip] 2020-06-12 19:07:51 -05:00
YakumoChen
2473308b4d Adds polychrome uniforms to loadout / kinkmate (#12506)
* adds revealing poly outfits to kinkmate

* Using unused poly uniforms

* adds polychrome to kinkmate
2020-06-12 17:07:48 -07:00
Ghom
7dc7961b70 Clearing gc issues for a couple objects. (#12508)
* Clearing gc issues for a couple objects.

* Linter check.
2020-06-12 17:07:36 -07:00
kevinz000
c42894ddd9 css? 2020-06-12 17:07:10 -07:00
kevinz000
52ab6e557b fix 2020-06-12 17:00:01 -07:00
kevinz000
3cf14f4fad prettier 2020-06-12 16:48:22 -07:00
kevinz000
6cf18e1d49 why did i find replace 2020-06-12 16:38:28 -07:00
kevinz000
c7eead3f28 don't blind find/replace folks 2020-06-12 16:34:54 -07:00
kevinz000
146542b077 sdql2 2020-06-12 16:33:36 -07:00
kevinz000
00666422af fix 2020-06-12 15:47:46 -07:00
kevinz000
86a07fffc3 line fix 2020-06-12 15:34:40 -07:00
kevinz000
f9c624ef80 based vorestation 2020-06-12 15:32:32 -07:00
CitadelStationBot
a22cc190a0 Automatic changelog generation for PR #12513 [ci skip] 2020-06-12 17:17:35 -05:00