Commit Graph

28420 Commits

Author SHA1 Message Date
Lin
acb2177a85 Merge pull request #14732 from Citadel-Station-13/silicons-patch-32
adds _contents() wrapper for SELECT SDQL2 statements
2021-05-19 14:50:18 -05:00
Lin
0c77834c56 Merge pull request #14733 from qweq12yt/misc-fixes
[Fix] Even More bug fixing
2021-05-19 14:49:00 -05:00
keronshb
58cb278327 Missing errors and icons 2021-05-19 15:09:56 -04:00
zerothebigboy
bc61ada440 KILL 2021-05-19 13:24:40 -04:00
keronshb
60965939d6 bigger mobs have some special health bars (#49104)
* cool beans

* more, more!

* smol fix
2021-05-19 11:59:50 -04:00
keronshb
f4780d4b5a Correct Raw Prophet recipe 2021-05-19 11:19:12 -04:00
keronshb
547b3d0a0b TP finally works 2021-05-19 11:15:48 -04:00
silicons
d0bb22da5f Merge pull request #14653 from timothyteakettle/rp-markings-attempt-two
ports rp's marking system
2021-05-19 08:02:59 -06:00
zerothebigboy
af4823e83c KILL 2021-05-19 09:19:49 -04:00
WanderingFox95
0294ddb2a6 Apply suggestions from code review
Co-authored-by: zeroisthebiggay <43571008+zeroisthebiggay@users.noreply.github.com>
2021-05-19 13:01:13 +02:00
WanderingFox95
4cd8cbd3e4 Same changes for the non human section of the ear file.
consistency.
2021-05-19 12:27:32 +02:00
WanderingFox95
eab45f0d64 Apply suggestions from code review
They're very fair.

Co-authored-by: zeroisthebiggay <43571008+zeroisthebiggay@users.noreply.github.com>
2021-05-19 09:48:38 +02:00
keronshb
b8b25662ff Couple of fixes, almost ready to go 2021-05-18 22:12:02 -04:00
zerothebigboy
e7c0dea497 actually an eris hairdo 2021-05-18 22:04:59 -04:00
zerothebigboy
89b2d74895 actually an eris hairdo 2021-05-18 22:00:35 -04:00
WanderingFox95
808e94899f Ear Adjustments 2021-05-19 01:38:28 +02:00
Putnam
fc31453587 Makes antags actually get activity properly 2021-05-18 16:27:07 -07:00
Putnam
030361e1cc suggestions 2021-05-18 16:18:57 -07:00
silicons
3dc78fa64d Merge pull request #14725 from zeroisthebiggay/baystation
now approaching: Baystation
2021-05-18 17:09:13 -06:00
silicons
28c0d2c3cf Merge pull request #14730 from shellspeed1/plumbing-pod
Empty mining capsule pod for all those fun projects which need space.
2021-05-18 17:09:05 -06:00
silicons
898d1d2c7f Merge pull request #14731 from WanderingFox95/WanderingFox95-Efink
The E-Fink (Yes, really)
2021-05-18 17:08:58 -06:00
zerothebigboy
e22bdc3fb5 KILL 2021-05-18 18:56:28 -04:00
zerothebigboy
fff719c408 KILL 2021-05-18 18:47:12 -04:00
silicons
58df45ee3f Merge pull request #14727 from zeroisthebiggay/patch-10
more drink mixture flavortext
2021-05-18 16:44:35 -06:00
silicons
80bb2b235b Merge pull request #14726 from zeroisthebiggay/carshalash
ports Amaretto from TG
2021-05-18 16:44:24 -06:00
zeroisthebiggay
55383e0387 Update hair_head.dm 2021-05-18 17:27:59 -04:00
zerothebigboy
20ac75020d steponmycock 2021-05-18 17:23:07 -04:00
zeroisthebiggay
cc29443b53 Update hair_head.dm 2021-05-18 17:06:20 -04:00
zerothebigboy
2a3eb07bfd steponmycock 2021-05-18 16:57:52 -04:00
keronshb
d2f69acaf8 Space Dragon Event
Ports the Space Dragon event
2021-05-18 12:06:32 -04:00
qweq12yt
ba20b5b8aa fix emag shuttle order 2021-05-17 18:48:01 -03:00
qweq12yt
9dd372ed11 fix void cloak going to the void 2021-05-17 17:33:23 -03:00
silicons
780a579c7b Update SDQL_2_wrappers.dm 2021-05-17 12:20:15 -07:00
Timothy Teakettle
da7c1ddb0a bold statement for someone who didnt test their code 2021-05-17 19:04:51 +01:00
WanderingFox95
502092f284 changed sound path 2021-05-17 12:40:37 +02:00
WanderingFox95
57d22c6962 Typo 2021-05-17 12:36:12 +02:00
WanderingFox95
7cbe105061 Efink 2021-05-17 12:34:38 +02:00
WanderingFox95
499111edf8 Efink 2021-05-17 12:33:39 +02:00
WanderingFox95
1d56b9ceda E-Fink 2021-05-17 12:31:46 +02:00
WanderingFox95
a947ec1322 Recipes 2021-05-17 12:30:01 +02:00
Timothy Teakettle
6d13f09c3d Update preferences.dm 2021-05-17 11:20:47 +01:00
Timothy Teakettle
4cb0eb3418 Update preferences.dm 2021-05-17 10:59:26 +01:00
shellspeed1
e4e5d8f5cd adds an pod for projects 2021-05-17 00:59:10 -07:00
silicons
f802890153 Update world_topic.dm 2021-05-16 22:17:50 -07:00
Timothy Teakettle
80d287abca index magic moment 2021-05-16 03:10:35 +01:00
silicons
8ff0685f0d Update world_topic.dm 2021-05-15 18:28:00 -07:00
zeroisthebiggay
a0b83950ae Update drinks_recipes.dm 2021-05-15 12:03:04 -04:00
zeroisthebiggay
03c2f752fa Update drinks_recipes.dm 2021-05-15 11:51:43 -04:00
zeroisthebiggay
2bc5edede0 Update drinks_recipes.dm 2021-05-15 09:51:48 -04:00
zeroisthebiggay
8166167a45 Update drinks_recipes.dm 2021-05-15 09:44:21 -04:00