Commit Graph

13682 Commits

Author SHA1 Message Date
CitadelStationBot
ff8f35fc0e Fixes Battlecruiser Turrets and Improves Turret's Faction Capabilities 2018-02-13 20:47:14 -06:00
ExcessiveUseOfCobblestone
745ca227c3 Fixes Battlecruiser Turrets and Improves Turret's Faction Capabilities (#35427)
* Update portable_turret.dm

* Update portable_turret.dm

* Update portable_turret.dm

* f
2018-02-13 20:47:14 -06:00
CitadelStationBot
01f76f4588 Automatic changelog generation for PR #5440 [ci skip] 2018-02-13 19:56:23 -06:00
deathride58
040c43a531 Merge pull request #5440 from cebutris/analbeads
Ports prayer beads from Paradise
2018-02-14 01:56:21 +00:00
CitadelStationBot
fc92759584 Automatic changelog generation for PR #5470 [ci skip] 2018-02-13 19:47:44 -06:00
deathride58
568ab46076 Merge pull request #5470 from Citadel-Station-13/upstream-merge-35649
[MIRROR] Disables clogged vents until it can be reworked
2018-02-14 01:47:41 +00:00
CitadelStationBot
52566c5038 Disables clogged vents until it can be reworked 2018-02-13 18:46:43 -06:00
vuonojenmustaturska
9041b0b264 Disables clogged vents until it can be reworked 2018-02-13 18:46:43 -06:00
CitadelStationBot
f857f53524 Automatic changelog generation for PR #5469 [ci skip] 2018-02-13 18:37:51 -06:00
deathride58
668e0ed088 Merge pull request #5469 from Citadel-Station-13/upstream-merge-35607
[MIRROR] Transference potions rename the mob to just your name
2018-02-14 00:37:49 +00:00
deathride58
eb72a2fe12 Merge pull request #5468 from Citadel-Station-13/upstream-merge-35647
[MIRROR] Fix for invisible heartboxes
2018-02-14 00:37:19 +00:00
CitadelStationBot
79fddcb188 Automatic changelog generation for PR #5467 [ci skip] 2018-02-13 18:19:09 -06:00
deathride58
6c8ec4d3e9 Merge pull request #5467 from Citadel-Station-13/upstream-merge-35594
[MIRROR] Fixes rat kebabs
2018-02-14 00:19:07 +00:00
CitadelStationBot
9cfa77050d Transference potions rename the mob to just your name 2018-02-13 18:09:51 -06:00
Jack Edge
dffee58459 Transference potions rename the mob to just your name
So instead of "Braxton Cherry as parrot", it'll just be "Braxton Cherry"
now. Polymorphing keeps your name, this has always bugged me as ugly and
unneeded.
2018-02-13 18:09:51 -06:00
CitadelStationBot
7d046edb7f Fix for invisible heartboxes 2018-02-13 18:08:38 -06:00
TehZombehz
1346e88e6b Fix for invisible heartboxes 2018-02-13 18:08:38 -06:00
CitadelStationBot
29c352ba16 Fixes rat kebabs 2018-02-13 17:15:31 -06:00
vuonojenmustaturska
6bdb3ad4c0 Merge pull request #35594 from praisenarsie/patch-30
Fixes rat kebabs
2018-02-13 17:15:31 -06:00
deathride58
88098fe2e1 Merge pull request #5466 from Citadel-Station-13/upstream-merge-35642
[MIRROR] [s]Fixes blacklisted byond builds
2018-02-13 23:05:32 +00:00
CitadelStationBot
c354420afd [s]Fixes blacklisted byond builds 2018-02-13 16:48:48 -06:00
vuonojenmustaturska
6a094232bc Merge pull request #35642 from MrStonedOne/patch-482
[s]Fixes blacklisted byond builds
2018-02-13 16:48:48 -06:00
CitadelStationBot
900fab0bf2 Automatic changelog generation for PR #5465 [ci skip] 2018-02-13 15:24:20 -06:00
deathride58
637720a3d9 Merge pull request #5465 from Citadel-Station-13/upstream-merge-35597
[MIRROR] The Cook now only works under siege.
2018-02-13 21:24:18 +00:00
CitadelStationBot
a2c1aac79b Automatic changelog generation for PR #5464 [ci skip] 2018-02-13 15:23:50 -06:00
deathride58
6bb8418aeb Merge pull request #5464 from Citadel-Station-13/upstream-merge-35583
[MIRROR] Adds heart-shaped boxes of chocolate to the valentines event
2018-02-13 21:23:48 +00:00
CitadelStationBot
08090a2be4 The Cook now only works under siege. 2018-02-13 14:18:50 -06:00
Iamgoofball
5793fe893f The Cook now only works under siege. (#35597)
The chef's CQC skill now only works in the kitchen area
2018-02-13 14:18:49 -06:00
oranges
e6ace7bc56 Adds heart-shaped boxes of chocolate to the valentines event 2018-02-13 14:12:32 -06:00
LetterJay
c52562fed3 Update __donator.dm 2018-02-13 12:10:24 -06:00
deathride58
cdcf5f8982 Merge pull request #5461 from Citadel-Station-13/upstream-merge-35575
[MIRROR] Fixes communications console runtime
2018-02-13 17:19:00 +00:00
deathride58
fd707fa9d0 Merge pull request #5460 from Citadel-Station-13/upstream-merge-35571
[MIRROR] Fixes spider_infestation event
2018-02-13 17:18:45 +00:00
CitadelStationBot
fb764c77de Fixes communications console runtime 2018-02-13 10:29:47 -06:00
vuonojenmustaturska
d44ccdb009 Merge pull request #35575 from ShizCalev/communications-console-runtime
Fixes communications console runtime
2018-02-13 10:29:47 -06:00
LetterJay
311463c03d Merge pull request #5459 from Citadel-Station-13/upstream-merge-35574
[MIRROR] Sanity check for sentience event
2018-02-13 10:27:09 -06:00
LetterJay
42c197b1df Merge pull request #5458 from Citadel-Station-13/upstream-merge-35625
[MIRROR] Removes the empty moth language file
2018-02-13 10:26:57 -06:00
CitadelStationBot
cfa421bcd4 Fixes spider_infestation event 2018-02-13 10:23:28 -06:00
vuonojenmustaturska
3c9966041d Merge pull request #35571 from ShizCalev/spider_infestation-fix
Fixes spider_infestation event
2018-02-13 10:23:28 -06:00
CitadelStationBot
cdc8eea447 Sanity check for sentience event 2018-02-13 10:00:47 -06:00
vuonojenmustaturska
a103a44252 Merge pull request #35574 from ShizCalev/sentience-fix
Sanity check for sentience event
2018-02-13 10:00:47 -06:00
deathride58
322d8aa480 Merge pull request #5457 from Citadel-Station-13/upstream-merge-35565
[MIRROR] Fixes invalid throwat args
2018-02-13 15:02:20 +00:00
CitadelStationBot
f2b2bfbf98 Removes the empty moth language file 2018-02-13 08:55:12 -06:00
Leo
6d980b488d Merge pull request #35625 from praisenarsie/patch-31
Removes the empty moth language file
2018-02-13 08:55:12 -06:00
CitadelStationBot
91f5b571e9 Fixes invalid throwat args 2018-02-13 07:14:47 -06:00
ShizCalev
833a700cbb Fixes invalid throwat args (#35565) 2018-02-13 07:14:47 -06:00
LetterJay
d7a7bea995 Merge pull request #5439 from Citadel-Station-13/upstream-merge-35512
[MIRROR] Split up Revert/Removal
2018-02-13 06:28:42 -06:00
LetterJay
de4869542c Merge pull request #5443 from Citadel-Station-13/upstream-merge-35551
[MIRROR] Tests give 3 GBP
2018-02-13 06:28:33 -06:00
CitadelStationBot
306e51f9bf Automatic changelog generation for PR #5456 [ci skip] 2018-02-13 06:28:17 -06:00
LetterJay
66a2e037e7 Merge pull request #5456 from Citadel-Station-13/upstream-merge-35560
[MIRROR] Adds hooray emoji
2018-02-13 06:28:15 -06:00
LetterJay
7cf942250c Merge pull request #5455 from Citadel-Station-13/upstream-merge-35572
[MIRROR] Fixes skateboard runtime
2018-02-13 06:28:05 -06:00