Commit Graph

16723 Commits

Author SHA1 Message Date
CitadelStationBot ee3c09efa3 Automatic changelog generation for PR #6792 [ci skip] 2018-05-19 09:12:44 -05:00
LetterJay 69b4813469 Merge pull request #6792 from Citadel-Station-13/upstream-merge-37874
[MIRROR] Removes inherent toxin damage from lipolicide
2018-05-19 09:12:42 -05:00
CitadelStationBot f32c854751 Automatic changelog generation for PR #6791 [ci skip] 2018-05-19 09:12:26 -05:00
LetterJay 3a95262fb3 Merge pull request #6791 from Citadel-Station-13/upstream-merge-37903
[MIRROR] Buffs the bioterror kit
2018-05-19 09:12:24 -05:00
CitadelStationBot 8c63030a54 Automatic changelog generation for PR #6788 [ci skip] 2018-05-19 09:11:31 -05:00
LetterJay 5886e5add7 Merge pull request #6788 from Citadel-Station-13/upstream-merge-37898
[MIRROR] [s] Fixes oversight with foam
2018-05-19 09:11:29 -05:00
CitadelStationBot b236716b44 Automatic changelog generation for PR #6787 [ci skip] 2018-05-19 09:11:10 -05:00
LetterJay f0a8499efe Merge pull request #6787 from Citadel-Station-13/upstream-merge-37875
[MIRROR] Fixes radimmune mobs being killed by high bursts of radiation
2018-05-19 09:11:08 -05:00
LetterJay 8803db5ad5 Merge pull request #6784 from Citadel-Station-13/upstream-merge-37876
[MIRROR] Deltastation edits/fixes
2018-05-19 09:10:45 -05:00
LetterJay 88ad927838 Merge pull request #6772 from Citadel-Station-13/upstream-merge-37870
[MIRROR] Fixes decon message pronouns
2018-05-19 09:10:29 -05:00
letterjay c0c0f91fa1 Removes inherent toxin damage from lipolicide 2018-05-18 16:47:20 -05:00
Iamgoofball 7f66ccfc2b Removes inherent toxin damage from lipolicide (#37874)
* Removes inherent toxin damage from lipolicide

* Update description of lipolicide
2018-05-18 16:47:20 -05:00
letterjay 4c1b3b2705 Buffs the bioterror kit 2018-05-18 16:46:06 -05:00
81Denton 8235db8b5c this violates the space geneva convention (#37903) 2018-05-18 16:46:05 -05:00
letterjay 25ce4feb6f [s] Fixes oversight with foam 2018-05-18 08:29:48 -05:00
Dax Dupont 0dcd8fb37a Fixes oversight with foam (#37898)
braaap

TRUE FALSE

false false
2018-05-18 08:29:48 -05:00
letterjay 7104860dc7 Fixes radimmune mobs being killed by high bursts of radiation 2018-05-18 06:15:33 -05:00
ShizCalev 5ddcd7133f Fixes radimmune mobs being killed by radiation (#37875) 2018-05-18 06:15:33 -05:00
LetterJay 5ea6164bbc Update revolution.dm 2018-05-17 23:50:25 -05:00
LetterJay 329aabf301 Update cult.dm 2018-05-17 23:50:17 -05:00
LetterJay cceb549243 Update clockcult.dm 2018-05-17 23:50:08 -05:00
LetterJay bfcaceb4e1 Merge pull request #6785 from Citadel-Station-13/upstream-merge-37838
[MIRROR] Query debug logging
2018-05-17 22:50:19 -05:00
LetterJay b4d0a29fab Merge pull request #6783 from Citadel-Station-13/upstream-merge-37877
[MIRROR] Capitalizes Current Quirks
2018-05-17 22:49:25 -05:00
letterjay 62ec82b092 Query debug logging 2018-05-17 21:38:41 -05:00
Jordan Brown a61457cd47 Merge pull request #37838 from Jordie0608/ithoughtaboutmakingthissendanemailbutidontwanttodrownmyinbox
Query debug logging
2018-05-17 21:38:41 -05:00
letterjay 7e081ec34a Deltastation edits/fixes 2018-05-17 21:16:03 -05:00
Mark9013100 21b9f72e49 Deltastation edits/fixes (#37876)
Readds a missing solar panel to port-bow solars.
Replaces an access locked kitchen fridge in arrivals maintenance with its no-access variant.
Readds missing decal warning lines.
2018-05-17 21:16:02 -05:00
LetterJay c57467cde2 Merge pull request #6749 from deathride58/poojgone
Poojawa is gone, comrade
2018-05-17 20:56:18 -05:00
letterjay 048c9d1682 Capitalizes Current Quirks 2018-05-17 20:54:23 -05:00
ShizCalev abc57b0e53 Capitalized Current Quirks (#37877) 2018-05-17 20:54:23 -05:00
deathride58 649314c455 Merge pull request #6682 from Citadel-Station-13/upstream-merge-37429
[MIRROR] Update DMAPI to version 3.2.1.0
2018-05-17 18:14:54 +00:00
CitadelStationBot 8118bd3ff8 Automatic changelog generation for PR #6686 [ci skip] 2018-05-17 13:13:30 -05:00
deathride58 986ea603e9 Merge pull request #6686 from Citadel-Station-13/upstream-merge-37719
[MIRROR] [s] Fix wallets acting as though they still contain removed IDs
2018-05-17 18:13:28 +00:00
deathride58 146f953966 Merge pull request #6694 from Citadel-Station-13/upstream-merge-37423
[MIRROR] [s] Hallucinations 4.0
2018-05-17 18:12:57 +00:00
deathride58 290a4ef1de Merge pull request #6757 from Citadel-Station-13/upstream-merge-37850
[MIRROR] Fixes fireaxe butchering.
2018-05-17 18:12:33 +00:00
CitadelStationBot 44ca1dd5b9 Automatic changelog generation for PR #6758 [ci skip] 2018-05-17 13:12:18 -05:00
deathride58 97b72c0289 Merge pull request #6758 from Citadel-Station-13/upstream-merge-37853
[MIRROR] Fixes wrong circuits
2018-05-17 18:12:16 +00:00
deathride58 baec90fe11 Merge pull request #6759 from Citadel-Station-13/upstream-merge-37840
[MIRROR] Fixes meteors hitting qdeleted stuff.
2018-05-17 18:11:57 +00:00
CitadelStationBot 39515a04e9 Automatic changelog generation for PR #6760 [ci skip] 2018-05-17 13:11:26 -05:00
deathride58 cee67a7706 Merge pull request #6760 from Citadel-Station-13/upstream-merge-37602
[MIRROR] [Ready] Syndie air alarm/APC subtypes, cleaning up syndie lavaland piping
2018-05-17 18:11:24 +00:00
CitadelStationBot 4e5514ff97 Automatic changelog generation for PR #6762 [ci skip] 2018-05-17 13:10:32 -05:00
deathride58 5398828bb9 Merge pull request #6762 from Citadel-Station-13/upstream-merge-37860
[MIRROR] [s] Fixes bioware surgery exploit
2018-05-17 18:10:29 +00:00
deathride58 583de894f3 Merge pull request #6763 from Citadel-Station-13/upstream-merge-37863
[MIRROR] Fixes changeling team objectives (a bit)
2018-05-17 18:10:01 +00:00
deathride58 93a9afcf88 Merge pull request #6764 from Citadel-Station-13/upstream-merge-37839
[MIRROR] Fixes minor cleanbot runtime.
2018-05-17 18:09:31 +00:00
deathride58 5242d1ad4b Merge pull request #6768 from Citadel-Station-13/upstream-merge-37866
[MIRROR] Client topics only check for deleted objects when an object was actually passed
2018-05-17 18:09:00 +00:00
deathride58 cbac22ccb7 Merge pull request #6769 from Citadel-Station-13/upstream-merge-37868
[MIRROR] Fixes parallax runtime
2018-05-17 18:08:40 +00:00
CitadelStationBot aa1747bf07 Automatic changelog generation for PR #6771 [ci skip] 2018-05-17 13:08:25 -05:00
deathride58 b1d0d14834 Merge pull request #6771 from Citadel-Station-13/upstream-merge-37872
[MIRROR] Fixes Adminorazine killing ash lizards
2018-05-17 18:08:16 +00:00
CitadelStationBot 98dba850da Automatic changelog generation for PR #6773 [ci skip] 2018-05-17 13:07:48 -05:00
deathride58 db6fdc0f48 Merge pull request #6773 from Citadel-Station-13/upstream-merge-37836
[MIRROR] Circuit gun inhands and grabber fix
2018-05-17 18:07:46 +00:00