Commit Graph

43131 Commits

Author SHA1 Message Date
bunny232 26544ddbb7 21/79 not 20/80 2021-06-06 17:24:10 -04:00
Changelogs e24ecea492 Automatic changelog compile [ci skip] 2021-06-06 00:41:17 +00:00
Lin 697fffd347 Merge pull request #14792 from bunny232/meta-pool
More reasonable SUCC for the meta pool drain.
2021-06-05 16:27:12 -05:00
CitadelStationBot f3f5b0d605 Automatic changelog generation for PR #14793 [ci skip] 2021-06-05 16:26:23 -05:00
Lin 27d7b4b564 Merge pull request #14793 from bunny232/pool-fog
Pools now get misty at warm insteaed of scalding
2021-06-05 16:26:21 -05:00
Lin 06bcb7c904 Merge pull request #14795 from MrJWhit/boxstation-touchups2
Boxstation touchups2
2021-06-05 16:21:12 -05:00
Lin 5f6cb40d16 Merge pull request #14773 from Putnam3145/fix-activity-typo
Fixes an activity display issue
2021-06-04 21:37:42 -05:00
Changelogs 4b3a4d99dc Automatic changelog compile [ci skip] 2021-06-05 00:48:25 +00:00
CitadelStationBot 560ce54d59 Automatic changelog generation for PR #14763 [ci skip] 2021-06-04 17:37:59 -05:00
Putnam3145 b757e22956 Merge pull request #14763 from zeroisthebiggay/dogears
adds floppy dog ears that aren't obscenely dark
2021-06-04 15:37:57 -07:00
MrJWhit d3f6b69a86 Update BoxStation.dmm 2021-06-04 13:26:06 -04:00
CitadelStationBot 2ec1abe71e Automatic changelog generation for PR #14786 [ci skip] 2021-06-04 12:13:39 -05:00
Lin a31c99e361 Merge pull request #14786 from Arturlang/fixes_float
Fixes float()
2021-06-04 12:13:36 -05:00
CitadelStationBot 9acd1ed386 Automatic changelog generation for PR #14788 [ci skip] 2021-06-04 10:29:45 -05:00
silicons 4b3e33bb8a Merge pull request #14788 from coderbus13/master
Pubbystation toxins burn chamber fix
2021-06-04 08:29:43 -07:00
Changelogs 3fccc79483 Automatic changelog compile [ci skip] 2021-06-04 01:10:04 +00:00
bunny232 720966f31e Misty~ 2021-06-03 19:10:46 -04:00
bunny232 e4c01b3f74 Woopsie, right vars are set now 2021-06-03 18:49:43 -04:00
bunny232 4b5b6a9063 Update MetaStation.dmm 2021-06-03 18:38:59 -04:00
coderbus13 2cfbee96ea Delete temp 2021-06-03 01:09:41 -05:00
coderbus13 9df9828666 Add files via upload 2021-06-03 01:08:36 -05:00
coderbus13 8ca433fadb Create temp 2021-06-03 01:08:20 -05:00
coderbus13 8dff4fa301 Delete _maps/map_files/PubbyStation directory
all my homies hate webedit
2021-06-03 01:06:35 -05:00
CitadelStationBot ef4ea8b0da Automatic changelog generation for PR #14772 [ci skip] 2021-06-02 21:50:36 -05:00
Lin c2c2825027 Merge pull request #14772 from Putnam3145/fix-sniper-bad
Makes sniper zooming work
2021-06-02 21:50:33 -05:00
CitadelStationBot 36284922da Automatic changelog generation for PR #14785 [ci skip] 2021-06-02 20:23:09 -05:00
Lin 24f7576b92 Merge pull request #14785 from MrJWhit/metastation-fix
Metastation atmos fix
2021-06-02 20:23:06 -05:00
Changelogs 8a4c6c4cf4 Automatic changelog compile [ci skip] 2021-06-03 01:12:16 +00:00
CitadelStationBot c869f9b53a Automatic changelog generation for PR #14784 [ci skip] 2021-06-02 19:44:57 -05:00
Lin 0ead4e0bbb Merge pull request #14784 from TripleShades/sigh-pubby
Tiny Pubby Additions
2021-06-02 19:44:55 -05:00
Lin 5876399d14 Merge pull request #14723 from bunny232/delta-ce-office-update
Delta ce office rearrangement
2021-06-02 19:41:45 -05:00
CitadelStationBot b341c184b5 Automatic changelog generation for PR #14782 [ci skip] 2021-06-02 19:41:25 -05:00
Lin 2b8ef762a7 Merge pull request #14782 from MrJWhit/xenoruin-fix
Fixing xenoruins floor
2021-06-02 19:41:23 -05:00
Lin 0fdfda7dc4 Merge pull request #14764 from MrJWhit/boxstation-touchups
Touching up boxstation engineering
2021-06-02 19:40:59 -05:00
Artur f631879b88 fixes_float 2021-06-02 14:27:22 +03:00
MrJWhit 160882fb6c Update MetaStation.dmm 2021-06-01 21:48:22 -04:00
TripleShades e08c10e5fb fucking pubby
this should be everything
2021-06-01 17:00:16 -04:00
MrJWhit fe9fdf0975 Update lavaland_surface_alien_nest.dmm 2021-06-01 11:26:46 -04:00
silicons cb52be5dd9 fixes linter warnings (#14778)
* woo

* woo
2021-05-31 10:19:20 -05:00
bunny232 f70d6b9ea5 dir = 1 and adds a forgotten fire alarm. 2021-05-31 01:52:43 -04:00
bunny232 ff379e41b6 Think map preview think! 2021-05-31 01:47:49 -04:00
Changelogs 2ef7516bee Automatic changelog compile [ci skip] 2021-05-31 01:05:48 +00:00
Putnam 0dc1163a29 adds a sorely needed line break 2021-05-30 00:44:02 -07:00
Putnam 9040c08698 whoops i forgot the var 2021-05-30 00:38:07 -07:00
Putnam 2ab05d1247 makes sniper zooming work 2021-05-30 00:31:20 -07:00
Changelogs 4ca4d02fd8 Automatic changelog compile [ci skip] 2021-05-30 00:58:43 +00:00
Lin ef7a611baa Merge pull request #14769 from Citadel-Station-13/silicons-patch-34
tweaks slaughter demon slam check
2021-05-29 17:36:54 -05:00
Changelogs 687466c5aa Automatic changelog compile [ci skip] 2021-05-29 00:54:02 +00:00
Lin 9aeb71c296 Merge pull request #14761 from silicons/getflaticon
Fixes camera image taking
2021-05-28 12:37:09 -05:00
silicons caa2dbeefd Update slaughter.dm 2021-05-28 05:51:21 -07:00