Commit Graph
23306 Commits
Author SHA1 Message Date
siliconsandGitHub bf4936cb02 Merge pull request #12707 from Chiirno/slimebrain
Resprited brains into a new slime core sprite for jelly people.
2020-07-09 02:26:27 -07:00
siliconsandGitHub aae496492f Update revenant.dm 2020-07-09 02:22:30 -07:00
Putnam 7cf4a55496 at least it'll fail better this time 2020-07-09 02:18:08 -07:00
Putnam 196261296e probably fixes travis 2020-07-09 01:40:39 -07:00
Putnam aefdf9eef7 duplicate REVERSE_DIR 2020-07-09 01:38:17 -07:00
Putnam 2a04ab19fd windoors :b:roke 2020-07-09 01:36:57 -07:00
YakumoChenandGitHub bfa672b091 adds some rings to the wedding crate 2020-07-09 07:49:11 +00:00
YakumoChenandGitHub 1a82955f32 adds a wedding crate 2020-07-09 07:22:33 +00:00
Letter N eeedad21de ^w^ 2020-07-09 14:32:23 +08:00
Putnam 75c0b01c86 Updated to july 2020. 2020-07-08 23:13:26 -07:00
siliconsandGitHub 1b97c9954f Merge pull request #12712 from TheObserver-sys/Imadeanoops
Hey, what if you could actually make the donuts?
2020-07-08 22:54:53 -07:00
siliconsandGitHub be49be022b Merge pull request #12710 from Sneakyrat6/hoodieFix
Fixes hair falling out of hoodies
2020-07-08 22:52:20 -07:00
siliconsandGitHub 9828d6fe85 Merge pull request #12700 from KeRSedChaplain/POSTRATVAR
Post This Ratvar, OR how I regained my contributor role in one simple step, OR how I buffed clock cult unknowingly.
2020-07-08 22:51:36 -07:00
Putnam a625d6562b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into putnamos-for-real 2020-07-08 22:02:03 -07:00
HeroWithYay bed6f4ac91 Adds "Telecrystal Dust" a useless, red waste of syndicate resources that can be obtained by grinding raw telecrystals in a blender.
Also makes it so you can sell raw telecrystals at cargo 1000 points each which is also a considerable waste of TC.
2020-07-09 16:32:14 +12:00
DeltaFire 7aa160029f changes sent's healing a bit
No more killing augmented followers, it heals them aswell. Ratvar is a machine god afterall.
2020-07-08 23:45:35 +02:00
Artur e12d690d3f hopefulyl fixes cloning!?!? 2020-07-08 23:54:00 +03:00
Artur 0a9dc33ce1 Reverts cloning changes 2020-07-08 23:42:47 +03:00
Artur e3ba2e60c6 Not supported 2020-07-08 20:31:08 +03:00
siliconsandGitHub 6d1ca993f6 Merge pull request #12648 from timothyteakettle/tray-and-jar
bluespace tray + bluespace jar
2020-07-08 03:10:44 -07:00
Letter NandGitHub 2d447019c5 woops 2020-07-08 16:59:22 +08:00
Letter N 05684e7196 no config filter thing yet, but the code for it is "ready" 2020-07-08 16:36:58 +08:00
Letter N f757e54db9 muh immursion 2020-07-08 15:59:44 +08:00
Letter N 45a3c47608 removes fun 2020-07-08 15:10:49 +08:00
Sneakyrat6 fa8ea6c430 Merge remote-tracking branch 'upstream/master' into hoodieFix 2020-07-07 23:48:59 -05:00
silicons 22c3d9fe3e ok 2020-07-07 21:07:13 -07:00
Sneakyrat6 3569e8da1e Fixes hair falling out of hoodies 2020-07-07 22:31:00 -05:00
Timothy Teakettle f0935a784d two missing traits woops 2020-07-07 23:24:25 +01:00
Timothy Teakettle e07909ebe2 does it in a far superior way 2020-07-07 23:12:36 +01:00
LinandGitHub 33f56fd168 Merge pull request #12694 from Ghommie/Ghommie-cit833
mowing down experimental cloner copypasta.
2020-07-07 13:23:25 -05:00
Cirno 37f4022bfc Changed slime core to slime nucleus 2020-07-07 13:35:30 -03:00
Artur 280d3de6c3 Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-07-07 18:37:45 +03:00
Cirno fe45971e43 Added a slime core in the place of brains for jelly people 2020-07-07 12:05:06 -03:00
silicons 6634e43be4 fix 2020-07-07 07:41:33 -07:00
silicons cee15792b7 ok 2020-07-07 07:25:10 -07:00
siliconsandGitHub 9910867345 Update SDQL_2.dm 2020-07-07 06:19:17 -07:00
timothyteakettle ab5795b3d3 Update pet_carrier.dm 2020-07-07 03:03:09 +01:00
siliconsandGitHub 5b09b68c6d Merge pull request #12702 from DeltaFire15/actually-kill-once
[s] Fixes the 'Kill once' objective
2020-07-06 17:38:24 -07:00
siliconsandGitHub 0c0bf46f7f Merge pull request #12696 from Chiirno/emichemmastertweak
increased the amount of stuff the chem master can dispense from 10 to 20
2020-07-06 17:34:50 -07:00
siliconsandGitHub 4fa7a461ef Merge pull request #12684 from Owai-Seek/foodport-p1-7/1/20
Food ports, tweaks, and fixes.
2020-07-06 17:19:07 -07:00
GhomandGitHub c2746c723e Merge pull request #12698 from Owai-Seek/beebalmfix-7-4-20
Fixes Bee Balm
2020-07-07 00:22:33 +02:00
DeltaFire eeadc9a0e7 fixes the kill once objective
the target being afk / disconnecting is now only accepted at roundend, and doesn't lead to it being regarded as permanently completed midround.
2020-07-06 23:00:36 +02:00
GhomandGitHub e7d19f512e Merge pull request #12397 from Rohesie/cooldown
Ports TGMC timer cooldowns
2020-07-06 22:54:58 +02:00
GhomandGitHub bc5e7d1513 Merge pull request #12688 from Weblure/small-strides-fix
[READY] Fixes Small Strides Formula
2020-07-06 22:48:09 +02:00
Ghommie afb5b5237c linter & stuff. 2020-07-06 22:42:32 +02:00
Keate Senior 4ee72305d0 Post This Justiciar
sprites and object
2020-07-06 06:34:38 -04:00
Artur 8cbe248465 Updates paper to TG 2020-07-06 13:09:02 +03:00
Artur 3154e8c596 Updates components to TG and fixes can 2020-07-06 10:58:48 +03:00
Winter Flare 482785d922 Fixes Bee Balm 2020-07-05 19:14:03 -04:00
Artur 7ebc785437 fIXES UPLINK 2020-07-05 21:52:24 +03:00