Commit Graph

43082 Commits

Author SHA1 Message Date
WanderingFox95
df0e1057d1 Imagine this crazy person became a threat suddenly 2021-05-30 21:15:44 +02: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
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
CitadelStationBot
287dd8da4f Automatic changelog generation for PR #14748 [ci skip] 2021-05-25 11:54:21 -05:00
Lin
9679f79513 Merge pull request #14748 from bunny232/Meta-mapping-fix-captain
A clean map is a good map
2021-05-25 11:54:19 -05:00
zeroisthebiggay
bdd7ae54d4 Update miscellaneous.dm 2021-05-24 23:10:07 -04:00
zerothebigboy
fc3c898cd4 tab 2021-05-24 21:49:36 -04:00
zerothebigboy
36fe3fef76 abuse 2021-05-24 21:40:15 -04:00
Changelogs
1ed6c2d30c Automatic changelog compile [ci skip] 2021-05-25 00:30:36 +00:00
Linzolle
1bb911441c fix brand intelligence runtime 2021-05-24 17:53:05 -05:00
keronshb
13b589507d Clown Spawner
For admin fun!
2021-05-24 15:13:41 -04:00
keronshb
d7ae90eb13 Digitigrade vers 2021-05-24 13:33:12 -04:00
keronshb
77d302f8f6 Ports Swag Outfit 2021-05-24 12:47:55 -04:00
Changelogs
45a7a70665 Automatic changelog compile [ci skip] 2021-05-24 00:30:01 +00:00
Lin
8d9571b863 Merge pull request #14735 from IgiariValkyr/IgiariDonatorFix
Igiari Donator Item fix
2021-05-23 14:16:59 -05:00
CitadelStationBot
35e791ffc5 Automatic changelog generation for PR #14737 [ci skip] 2021-05-23 09:52:27 -05:00
silicons
eba3f554bc Merge pull request #14737 from zeroisthebiggay/KILL
Traitor's Bizarre Adventure Episode One: Mauler Gauntlets Are Unbreakable
2021-05-23 08:52:25 -06:00
CitadelStationBot
2742cb6988 Automatic changelog generation for PR #14736 [ci skip] 2021-05-23 09:52:16 -05:00
silicons
6d81996d8b Merge pull request #14736 from zeroisthebiggay/hair
big Aerial Rodent hair port because hair moment
2021-05-23 08:52:14 -06:00
Changelogs
a973c09f42 Automatic changelog compile [ci skip] 2021-05-23 00:32:02 +00:00
bunny232
a1cdc7d5a7 Update MetaStation.dmm 2021-05-22 19:37:41 -04:00
zerothebigboy
25c99bb23c fuckihatecoding 2021-05-22 11:52:55 -04:00
zerothebigboy
01a9904b97 SHOW THE UNVERSIONED FILES 2021-05-22 10:29:57 -04:00
zeroisthebiggay
84e0167698 Delete AutoChangeLog-pr-14738.yml 2021-05-22 10:28:46 -04:00
zerothebigboy
07682b71b3 shoujo 2021-05-22 10:28:06 -04:00