Commit Graph

23099 Commits

Author SHA1 Message Date
CitadelStationBot
f376fac53d Automatic changelog generation for PR #9133 [ci skip] 2019-08-16 18:59:53 -05:00
kevinz000
da7f4bfb9b Merge pull request #9133 from Raptorizer/Peaches
Increase the amount of canned peaches that spawn within maintenance
2019-08-16 16:59:52 -07:00
kevinz000
cf55151f04 Merge pull request #9131 from jakeramsay007/Runtime-Fixes
Prevents runtime spam from Hugs of the North Star
2019-08-16 16:59:11 -07:00
CitadelStationBot
dea9ea4b3f Automatic changelog generation for PR #9119 [ci skip] 2019-08-16 18:58:29 -05:00
kevinz000
bdf7fb6980 Merge pull request #9119 from Linzolle/miningshuttle
Adds mining shuttle console to the techweb.
2019-08-16 16:58:27 -07:00
CitadelStationBot
a124b02ee2 Automatic changelog generation for PR #9107 [ci skip] 2019-08-16 18:57:39 -05:00
kevinz000
97306ff53c Merge pull request #9107 from deathride58/fixesarest
Fixes handcuffs being impossible to actually resist out of
2019-08-16 16:57:36 -07:00
Raptorizer
d16ee247a0 Update maintenance_loot.dm
Double the amount of peaches that spawn within Maintenance
2019-08-15 07:24:09 -05:00
Raptorizer
a6d10885ec Revert "Update maintenance_loot.dm"
This reverts commit 087bca85e8.
2019-08-15 07:11:57 -05:00
Raptorizer
087bca85e8 Update maintenance_loot.dm
Double the amount of canned peaches that spawn within maintenance
2019-08-15 07:08:27 -05:00
CitadelStationBot
0125a20252 Automatic changelog generation for PR #9126 [ci skip] 2019-08-15 03:12:15 -05:00
kevinz000
2cdfa9cf2f Merge pull request #9126 from Sishen1542/viro-cures
Adds more variety in virus cures, more consistent difficulty scaling.
2019-08-15 01:12:12 -07:00
deathride58
7879d1ce13 Merge pull request #9103 from Citadel-Station-13/atmosberet
Donator item
2019-08-14 15:44:24 -04:00
CitadelStationBot
e84bad1e55 Automatic changelog generation for PR #9052 [ci skip] 2019-08-14 14:43:53 -05:00
deathride58
5f6a110f73 Merge pull request #9052 from Citadel-Station-13/kevinz000-patch-71
Hmm, today the Hierophant will go sicko mode on shaft miners.
2019-08-14 15:43:51 -04:00
CitadelStationBot
bcf3c1a172 Automatic changelog generation for PR #9100 [ci skip] 2019-08-14 14:40:56 -05:00
deathride58
2406254faa Merge pull request #9100 from cebutris/got-milk
Breasts no longer lactate by default, Lactation is now a preference
2019-08-14 15:40:53 -04:00
CitadelStationBot
b6478b0254 Automatic changelog generation for PR #9098 [ci skip] 2019-08-14 14:31:49 -05:00
deathride58
089a613683 Merge pull request #9098 from cebutris/tea-fix
Fixes Tea Aspera
2019-08-14 15:31:46 -04:00
deathride58
2302e24255 Merge pull request #9116 from Citadel-Station-13/kevinz000-patch-73
Changes beforeShuttleMove on airlock to addtimer(0) rather than InvokeAsync
2019-08-14 15:10:49 -04:00
deathride58
9010b9003a Merge pull request #8930 from Citadel-Station-13/kevinz000-patch-54
Fixes nanite viruses take two
2019-08-14 15:01:33 -04:00
deathride58
5a4d0a73ce Merge pull request #9038 from Citadel-Station-13/kevinz000-patch-67
Fixes/tweaks jump boots
2019-08-14 15:00:36 -04:00
CitadelStationBot
3610d14869 Automatic changelog generation for PR #9115 [ci skip] 2019-08-14 13:59:44 -05:00
deathride58
93721c5224 Merge pull request #9115 from Thalpy/wah
Removes wah! from message_admins
2019-08-14 14:59:42 -04:00
CitadelStationBot
b23b574baf Automatic changelog generation for PR #9113 [ci skip] 2019-08-14 13:59:16 -05:00
deathride58
315828845d Merge pull request #9113 from Thalpy/RoundingErrors
[SUGGESTED TESTMERGE] Fixes rounding errors with chemical reactions
2019-08-14 14:59:13 -04:00
Chayse Ramsay
97c3b2eda7 Prevents runtime spam from Hugs of the North Star
Also fixes an unintended oversight of the Gloves of the North Star, with them causing the warcry upon picking up any item or clicking on any item in harm intent.
2019-08-14 18:29:35 +01:00
Sishen
382487fdc2 viruseseses-cures 2019-08-13 05:32:37 -04:00
Linzolle
13b3552e64 i'm dumb 2019-08-12 14:37:48 -05:00
Linzolle
2095a14256 add mining shuttle console to techweb 2019-08-12 13:49:26 -05:00
kevinz000
411e0cc2cc Update on_move.dm 2019-08-12 00:17:31 -07:00
Fermi
5a9b2bcad7 Added COORD 2019-08-12 05:10:46 +01:00
Fermi
ae1191a469 Changes an oversight (and a unintended wah!) 2019-08-12 05:10:05 +01:00
Fermi
51a6ae96a0 R.data 2019-08-12 00:37:57 +01:00
Fermi
c0bbb099f8 Fixes disappearing chems. 2019-08-12 00:36:45 +01:00
CitadelStationBot
cf44c96be9 Automatic changelog generation for PR #8992 [ci skip] 2019-08-11 12:15:51 -05:00
kevinz000
a971390cff Merge pull request #8992 from jakeramsay007/Helmet-Internals
[READY] Hardsuit helmets can now be used as internals masks. Rejoice, CE mains.
2019-08-11 10:15:49 -07:00
CitadelStationBot
ed71bf4104 Automatic changelog generation for PR #9010 [ci skip] 2019-08-11 12:13:04 -05:00
kevinz000
d3b3836d33 Merge pull request #9010 from BurgerLUA/Actual-War-Ops
War Ops now informs the crew where the Nuclear Device is located when activated.
2019-08-11 10:13:02 -07:00
CitadelStationBot
5f74d55bde Automatic changelog generation for PR #8927 [ci skip] 2019-08-11 12:12:22 -05:00
kevinz000
123b478edd Merge pull request #8927 from Ghommie/Ghommie-cit151
Tones down some items attack stamina costs. kills hypereutactic blades copypasta.
2019-08-11 10:12:20 -07:00
CitadelStationBot
f81ad400b4 Automatic changelog generation for PR #9054 [ci skip] 2019-08-11 12:11:14 -05:00
kevinz000
b75c82b4ee Merge pull request #9054 from Sishen1542/stando
stands now remove trait_nodeath from their user if given by memento mori
2019-08-11 10:11:11 -07:00
CitadelStationBot
0dcd3a2688 Automatic changelog generation for PR #9062 [ci skip] 2019-08-11 12:08:47 -05:00
kevinz000
69884d1abe Merge pull request #9062 from Trilbyspaceclone/patch-207
Makes smile not as horrable.
2019-08-11 10:08:45 -07:00
kevinz000
96842ed1c3 Merge pull request #9075 from Ghommie/Ghommie-cit184
Removes a redunant Remove() from high luminosity eyes.
2019-08-11 10:05:58 -07:00
CitadelStationBot
ffd4edffe6 Automatic changelog generation for PR #9079 [ci skip] 2019-08-11 12:01:12 -05:00
kevinz000
cba8d3478a Merge pull request #9079 from Sishen1542/lingblade
gives ling armblade 20 armor pen to make it more in line with eswords
2019-08-11 10:01:10 -07:00
kevinz000
3b5600b81d Merge pull request #9092 from Sishen1542/emp-beacons
crew combat mechs are now spawned in with a tracking beacon
2019-08-11 10:00:36 -07:00
CitadelStationBot
aa4e20c6b3 Automatic changelog generation for PR #9101 [ci skip] 2019-08-11 11:59:32 -05:00