Commit Graph

44114 Commits

Author SHA1 Message Date
bunny232 50cf7a85f8 Merge pull request #2 from Citadel-Station-13/master
a
2021-08-08 08:51:58 -04:00
silicons 8b09d98361 Merge pull request #14978 from Citadel-Station-13/mgas-dontoar
Adds military gas mask for donator
2021-08-08 04:08:37 -07:00
CitadelStationBot 9207b10804 Automatic changelog generation for PR #14971 [ci skip] 2021-08-08 06:06:21 -05:00
silicons 59e541d2e7 Merge pull request #14971 from Arturlang/nanite_updates
Ports update appearance
2021-08-08 04:06:18 -07:00
Changelogs 9457b6b3e2 Automatic changelog compile [ci skip] 2021-08-08 00:25:04 +00:00
Changelogs b93e3f68b2 Automatic changelog compile [ci skip] 2021-08-07 00:22:33 +00:00
CitadelStationBot efa7c068b5 Automatic changelog generation for PR #14984 [ci skip] 2021-08-06 18:20:49 -05:00
Lin 139b08a734 Merge pull request #14984 from Putnam3145/supernova-more-than-one
Halves probability on supernova rads
2021-08-06 18:20:46 -05:00
CitadelStationBot 24bf742298 Automatic changelog generation for PR #14975 [ci skip] 2021-08-05 22:42:24 -05:00
Lin 6d093572cc Merge pull request #14975 from BlueWildrose/skirtbullshit
Fixes certain skirty uniforms not having the FEMALE_UNIFORM_TOP fitted flag
2021-08-05 22:42:21 -05:00
CitadelStationBot bf5cd292b5 Automatic changelog generation for PR #14983 [ci skip] 2021-08-05 20:02:41 -05:00
silicons 7b42b35f85 Merge pull request #14983 from Putnam3145/monstermos-fix-for-real
(Please testmerge first) Enables monstermos
2021-08-05 18:02:38 -07:00
Changelogs 5f9558a0f9 Automatic changelog compile [ci skip] 2021-08-06 00:24:16 +00:00
Putnam3145 39679ea239 explicit "no rads" sentence 2021-08-05 06:19:29 -07:00
Putnam3145 571c017eec Also makes the end stuff only show if announced 2021-08-05 06:18:33 -07:00
Putnam3145 f821315263 Halves probability on supernova rads 2021-08-05 06:14:38 -07:00
Changelogs 7538ff1954 Automatic changelog compile [ci skip] 2021-08-05 00:26:05 +00:00
bunny232 891824182b Merge pull request #1 from Citadel-Station-13/master
a
2021-08-04 19:41:56 -04:00
Putnam3145 7e34540903 Enables monstermos. 2021-08-04 00:54:52 -07:00
silicons f327592784 Update __donator.dm 2021-08-04 00:51:37 -07:00
CitadelStationBot 1440eec25f Automatic changelog generation for PR #14982 [ci skip] 2021-08-03 23:21:43 -05:00
silicons a6e7969583 Merge pull request #14982 from Citadel-Station-13/Putnam3145-patch-1
makes organs decay again
2021-08-03 21:21:40 -07:00
silicons f1a553a8fa Merge pull request #14979 from Arturlang/fucking_line_endings
line ending fuckery
2021-08-03 21:19:37 -07:00
Putnam3145 77f62fa7df makes organs decay again 2021-08-03 21:19:28 -07:00
Changelogs d0d1b05298 Automatic changelog compile [ci skip] 2021-08-04 00:22:20 +00:00
CitadelStationBot e3d7b3adc5 Automatic changelog generation for PR #14951 [ci skip] 2021-08-03 15:10:09 -05:00
Putnam3145 d046357418 Merge pull request #14951 from timothyteakettle/leg-split
[TESTMERGE FIRST HOLY SHIT FUCK] fixes every single leg sprite in the entire game
2021-08-03 13:10:06 -07:00
CitadelStationBot ab8b7cd57f Automatic changelog generation for PR #14977 [ci skip] 2021-08-03 12:15:46 -05:00
Lin d6b4b3b1f4 Merge pull request #14977 from BlueWildrose/hollowedhead
Fixes brainless sprite being an error sprite
2021-08-03 12:15:43 -05:00
Changelogs ab95de0bff Automatic changelog compile [ci skip] 2021-08-03 00:26:25 +00:00
CitadelStationBot fb11ddc8df Automatic changelog generation for PR #14817 [ci skip] 2021-08-02 19:11:22 -05:00
silicons 2192d8a87e Merge pull request #14817 from zeroisthebiggay/endit
[READY] tempgun rebalance (it's not a nerf don't worry)
2021-08-02 17:11:20 -07:00
Artur 772bfaba75 line ending fuckery 2021-08-03 00:59:48 +03:00
Changelogs f869d28254 Automatic changelog compile [ci skip] 2021-08-02 00:24:00 +00:00
Jay a88e83e579 Adds military gas mask for donator 2021-08-01 18:42:43 -05:00
BlueWildrose cfc3a12a26 these don't have alternate sprites so therefore... 2021-08-01 07:24:36 -07:00
BlueWildrose f747f76bd4 fix kimonos 2021-08-01 07:18:45 -07:00
BlueWildrose fb886778b2 fix bathrobe 2021-08-01 07:17:29 -07:00
BlueWildrose 0735ec66b3 Fixes brainless sprite being an error sprite 2021-08-01 06:33:08 -07:00
CitadelStationBot 08cbeeaf33 Automatic changelog generation for PR #14973 [ci skip] 2021-07-31 23:25:44 -05:00
Putnam3145 9ed9fbcc73 Merge pull request #14973 from TripleShades/pubbyyyy
[FAST MERGE] Pubby Deco Fix
2021-07-31 21:25:40 -07:00
BlueWildrose 1b31e4d626 let's fix some grammar while we're here. 2021-07-31 05:31:21 -07:00
BlueWildrose 698969933e fixing qipao women fitted states 2021-07-31 05:18:50 -07:00
BlueWildrose ef413f5d2b fix miscellaneous female fittings 2021-07-31 05:15:46 -07:00
TripleShades dfff5339c9 Update water.dm 2021-07-31 00:23:09 -04:00
TripleShades 652ffe22a2 Update water.dm 2021-07-30 23:58:11 -04:00
TripleShades 7d7525825d deco waterrrr 2021-07-30 23:51:57 -04:00
TripleShades b682d886e9 Update PubbyStation.dmm 2021-07-30 23:44:15 -04:00
TripleShades 52659ffe53 Update PubbyStation.dmm 2021-07-30 23:38:36 -04:00
TripleShades 4eb8b2701d Update PubbyStation.dmm 2021-07-30 23:10:28 -04:00