Commit Graph
35158 Commits
Author SHA1 Message Date
siliconsandGitHub af9348c443 Merge pull request #12708 from EmeraldSundisk/poolby
Adds a pool to PubbyStation.
2020-07-09 02:26:39 -07:00
CitadelStationBot 3c0219e599 Automatic changelog generation for PR #12707 [ci skip] 2020-07-09 04:26:30 -05:00
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
CitadelStationBot 2c94dc5d41 Automatic changelog generation for PR #12712 [ci skip] 2020-07-09 00:54:56 -05: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
CitadelStationBot c1a985d154 Automatic changelog generation for PR #12710 [ci skip] 2020-07-09 00:52:22 -05: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
Changelogs d79e1cdb9d Automatic changelog compile [ci skip] 2020-07-09 00:10:33 +00:00
CitadelStationBot ba9a6cbbf3 Automatic changelog generation for PR #12648 [ci skip] 2020-07-08 05:10:48 -05:00
siliconsandGitHub 6d1ca993f6 Merge pull request #12648 from timothyteakettle/tray-and-jar
bluespace tray + bluespace jar
2020-07-08 03:10:44 -07:00
Sneakyrat6 fa8ea6c430 Merge remote-tracking branch 'upstream/master' into hoodieFix 2020-07-07 23:48:59 -05:00
Sneakyrat6 3569e8da1e Fixes hair falling out of hoodies 2020-07-07 22:31:00 -05:00
Changelogs bfa54f7e23 Automatic changelog compile [ci skip] 2020-07-08 00:09:46 +00:00
Keate Senior 150a31a584 new and improved, less jarring poster
as it says on the tin, makes the text static on the sprite
2020-07-07 19:56:46 -04: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
EmeraldSundiskandGitHub e0a0d0bed8 Add files via upload 2020-07-07 09:05:31 -07:00
Cirno fe45971e43 Added a slime core in the place of brains for jelly people 2020-07-07 12:05:06 -03:00
EmeraldSundisk 96f48c8237 Update PubbyStation.dmm 2020-07-07 00:01:25 -07:00
EmeraldSundiskandGitHub 168a179bfb Merge pull request #48 from Citadel-Station-13/master
7/6
2020-07-06 22:05:40 -07:00
timothyteakettle 8eda04bc60 Merge branch 'tray-and-jar' of https://github.com/timothyteakettle/Citadel-Station-13 into tray-and-jar 2020-07-07 03:03:32 +01:00
timothyteakettle ab5795b3d3 Update pet_carrier.dm 2020-07-07 03:03:09 +01:00
CitadelStationBot 1d791c4808 Automatic changelog generation for PR #12702 [ci skip] 2020-07-06 19:38:27 -05: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
CitadelStationBot 94825ec073 Automatic changelog generation for PR #12697 [ci skip] 2020-07-06 19:34:40 -05:00
siliconsandGitHub fb23905f42 Merge pull request #12697 from EmeraldSundisk/cogmedsci
Updates Cog's chemistry lab.
2020-07-06 17:34:36 -07:00
CitadelStationBot 00f1818dbc Automatic changelog generation for PR #12684 [ci skip] 2020-07-06 19:19:10 -05: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
Changelogs b3b04f02e3 Automatic changelog compile [ci skip] 2020-07-07 00:09:53 +00:00
CitadelStationBot 0432eaf6d9 Automatic changelog generation for PR #12698 [ci skip] 2020-07-06 17:22:37 -05: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
DeltaFire 18d8b5b0a8 Merge remote-tracking branch 'upstream/master' 2020-07-06 22:54:04 +02:00
CitadelStationBot d6364259d5 Automatic changelog generation for PR #12688 [ci skip] 2020-07-06 15:48:12 -05: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
CitadelStationBot 028f4d11e8 Automatic changelog generation for PR #12699 [ci skip] 2020-07-06 15:47:50 -05:00
GhomandGitHub af1f715b3e Merge pull request #12699 from KasparoVy/silverlwraps-fix
Shifts South Dir of Silver LWraps Right 1px
2020-07-06 22:47:48 +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
KasparoVy b41ed4c9f5 Shifts South Dir of Silver LWraps Right 1px
Not sure when this happened.
2020-07-05 21:28:57 -04:00
Winter Flare 482785d922 Fixes Bee Balm 2020-07-05 19:14:03 -04:00
EmeraldSundiskandGitHub 672f86a318 Add files via upload 2020-07-05 09:39:53 -07:00
EmeraldSundisk 75b2a7dad5 Update CogStation.dmm 2020-07-05 09:18:26 -07:00
Cirno 45d97b2251 increased the amount of stuff the chem master can dispense from 10 to 20 2020-07-05 11:17:37 -03:00
EmeraldSundisk d9f269280b Update CogStation.dmm 2020-07-04 23:45:08 -07:00