Commit Graph
35198 Commits
Author SHA1 Message Date
siliconsandGitHub 6ba38424fe Merge pull request #12732 from zeroisthebiggay/benisXXDD
removes a stray pixel from the muzzled clearmasks
2020-07-11 00:14:14 -07:00
zerothebigboy 13d85a4e0c penis 2020-07-10 22:13:40 -04:00
Changelogs 2d84df4917 Automatic changelog compile [ci skip] 2020-07-11 00:10:04 +00:00
LinandGitHub 49ae116bac Merge pull request #12705 from Citadel-Station-13/silicons-patch-16
fixes sdql2 array operator not properly nesting lists
2020-07-10 14:56:31 -05:00
LinandGitHub 6fb729d69c Merge pull request #12718 from Citadel-Station-13/silicons-patch-17
Fixes revenants for real because they're just that much shitcode
2020-07-10 14:55:51 -05:00
CitadelStationBot 224f564e62 Automatic changelog generation for PR #12217 [ci skip] 2020-07-09 22:37:23 -05:00
siliconsandGitHub 31da81aff4 Merge pull request #12217 from Putnam3145/putnamos-for-real
The real fastmos: C++ monstermos port
2020-07-09 20:37:18 -07:00
Changelogs 25ea41c4a4 Automatic changelog compile [ci skip] 2020-07-10 00:09:48 +00:00
BlackMajorandGitHub 0c7b06baf4 Merge pull request #12719 from Citadel-Station-13/silicons-patch-18
fixes infinite recursion in canisters
2020-07-09 22:25:22 +12:00
Putnam 9b955e5d03 gotta replace all of them actually 2020-07-09 03:19:52 -07:00
siliconsandGitHub 93e0ceded7 Update canister.dm 2020-07-09 03:01:56 -07:00
Putnam 835dd722e5 monster told me this would fix it 2020-07-09 02:31:38 -07:00
CitadelStationBot b104241a5f Automatic changelog generation for PR #12708 [ci skip] 2020-07-09 04:26:42 -05:00
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
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
Putnam 75c0b01c86 Updated to july 2020. 2020-07-08 23:13:26 -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
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
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
siliconsandGitHub 9910867345 Update SDQL_2.dm 2020-07-07 06:19:17 -07: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