Commit Graph

43106 Commits

Author SHA1 Message Date
Changelogs
3fccc79483 Automatic changelog compile [ci skip] 2021-06-04 01:10:04 +00: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
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
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
CitadelStationBot
396bd8d302 Automatic changelog generation for PR #14757 [ci skip] 2021-05-28 07:50:22 -05:00
silicons
7c1b8ee07d Merge pull request #14757 from Kraseo/no-bloodcrawlies
fixes being able to slam into people while bloodcrawled as slaughter demon
2021-05-28 06:50:19 -06:00
silicons
33097a9d82 Merge pull request #14758 from MrJWhit/pubby-atmos-fix
Pubby atmos Mixing will no longer auto-suck gasses
2021-05-27 21:27:20 -06:00
CitadelStationBot
354d2f57ad Automatic changelog generation for PR #14751 [ci skip] 2021-05-27 22:27:17 -05:00
silicons
42e382bb45 Merge pull request #14751 from keronshb/clownnades
Ports the Clown Mob Spawner from /tg/ for admins
2021-05-27 21:27:15 -06:00
CitadelStationBot
0849b5bbf4 Automatic changelog generation for PR #14755 [ci skip] 2021-05-27 22:27:02 -05:00
silicons
e686270b4d Merge pull request #14755 from Linzolle/brand
fix brand intelligence runtime
2021-05-27 21:26:59 -06:00
CitadelStationBot
c9d03cb315 Automatic changelog generation for PR #14750 [ci skip] 2021-05-27 22:26:54 -05:00
silicons
e1efdb7937 Merge pull request #14750 from keronshb/swagoutfitport
Ports Swag outfit from /tg/
2021-05-27 21:26:52 -06:00
CitadelStationBot
702d7acbf3 Automatic changelog generation for PR #14756 [ci skip] 2021-05-27 22:26:46 -05:00
silicons
a4e20d8164 Merge pull request #14756 from zeroisthebiggay/toomuch
Why Are My Hands Doing Forty Damage Per Punch?: you can no longer stack damage bonuses from scarp + pugilist
2021-05-27 21:26:43 -06:00
Changelogs
1811310993 Automatic changelog compile [ci skip] 2021-05-28 00:43:54 +00:00
MrJWhit
0f0ad31aab Update BoxStation.dmm 2021-05-27 17:58:21 -04:00
bunny232
11a6cfd99c Delta station ce office, now with less microwave slaughter. 2021-05-27 03:27:10 -04:00
silicons
3c42247870 fix 2021-05-26 20:19:47 -07:00
Changelogs
bff21669e3 Automatic changelog compile [ci skip] 2021-05-27 00:38:53 +00:00
Changelogs
9b445427b4 Automatic changelog compile [ci skip] 2021-05-26 00:36:51 +00:00
Kraseo
c3bfbac89a this time for real 2021-05-26 01:43:45 +02:00
MrJWhit
7b152f2046 Update PubbyStation.dmm 2021-05-25 19:01:38 -04:00
MrJWhit
7262f3845f Update PubbyStation.dmm 2021-05-25 18:41:30 -04:00
Kraseo
7173bfade5 this is why i don't do webedits 2021-05-26 00:35:49 +02:00
Kraseo
50bdfd521e i hate continuous integration i hate continuous integration 2021-05-26 00:35:05 +02:00
Kraseo
3b5f391843 Merge branch 'master' into no-bloodcrawlies 2021-05-26 00:29:20 +02:00
Kraseo
7e2e608784 fixes slamming people into walls and such while bloodcrawled
no
2021-05-26 00:23:11 +02:00