Commit Graph

20641 Commits

Author SHA1 Message Date
kevinz000
fa4e1f44ff Merge pull request #8438 from BurgerLUA/AssFix
Ass Fix
2019-05-26 19:19:13 -07:00
CitadelStationBot
33d40c0e94 Automatic changelog generation for PR #8435 [ci skip] 2019-05-26 19:23:07 -05:00
kevinz000
d4026d70ff Merge pull request #8435 from Ghommie/Ghommie-cit17
lazyinitlist on IAA targets stealing.
2019-05-26 17:23:05 -07:00
CitadelStationBot
81da063fa8 Automatic changelog generation for PR #8419 [ci skip] 2019-05-26 19:22:46 -05:00
kevinz000
e204cdc84e Merge pull request #8419 from UntoldTactics/Cult-Changes
Rewords Blood Cult 'offer' rune click here prompt.
2019-05-26 17:22:43 -07:00
BurgerLua
125db4c6b4 Added 2019-05-25 21:21:52 -07:00
UntoldTactics
49351fe909 Update code/modules/antagonists/cult/runes.dm
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com>
2019-05-26 12:23:35 +10:00
CitadelStationBot
851072ff23 Automatic changelog generation for PR #8325 [ci skip] 2019-05-25 13:51:21 -05:00
kevinz000
0dba89c4e7 Merge pull request #8325 from Trilbyspaceclone/patch-118
[Ready] Cleaner looking autolathen organization
2019-05-25 11:51:17 -07:00
CitadelStationBot
b6abfeb1fc Automatic changelog generation for PR #8417 [ci skip] 2019-05-25 13:34:59 -05:00
kevinz000
90a3199315 Merge pull request #8417 from Trilbyspaceclone/patch-136
Gives space queen's men void jet packs + tweeks
2019-05-25 11:34:55 -07:00
CitadelStationBot
bc8b4485e0 Automatic changelog generation for PR #8413 [ci skip] 2019-05-25 13:32:26 -05:00
kevinz000
d0f61c5f41 Merge pull request #8413 from Useroth/hotel-dorms
Boltable hotel dorms. Now with mapmerge. Also the hotel booze-o-mat doesn't require access anymore.
2019-05-25 11:32:23 -07:00
CitadelStationBot
34bc572dd6 Automatic changelog generation for PR #8296 [ci skip] 2019-05-25 13:31:33 -05:00
kevinz000
a4b2aa0420 Merge pull request #8296 from Trilbyspaceclone/patch-112
Nerfs Synda NPC block Rng to 25%
2019-05-25 11:31:30 -07:00
CitadelStationBot
38304ca471 Automatic changelog generation for PR #8384 [ci skip] 2019-05-25 13:31:00 -05:00
kevinz000
d0819246bc Merge pull request #8384 from nero1024/footstepB
Ports new footstep sounds from base /tg/
2019-05-25 11:30:57 -07:00
CitadelStationBot
d1cdf35007 Automatic changelog generation for PR #8397 [ci skip] 2019-05-25 13:30:21 -05:00
kevinz000
e434b9ceb5 Merge pull request #8397 from WhiteHusky/arousal-related-styling-fixes
Changed arousal message styling.
2019-05-25 11:30:18 -07:00
CitadelStationBot
dd2259c11c Automatic changelog generation for PR #8399 [ci skip] 2019-05-25 13:29:24 -05:00
kevinz000
aeace88306 Merge pull request #8399 from Poojawa/doctor-chemistry
Large Maps given an Apothecary
2019-05-25 11:29:20 -07:00
CitadelStationBot
e4b9fe7359 Automatic changelog generation for PR #8398 [ci skip] 2019-05-25 13:28:43 -05:00
kevinz000
deffcb3226 Merge pull request #8398 from BurgerLUA/AntiAssSlap
Nerfs Ass Slapping, or how a meme PR made me butthurt, or how I'm now resorting to making degenerate PRs such as this since my permaban from Aurora
2019-05-25 11:28:39 -07:00
CitadelStationBot
83f65f248d Automatic changelog generation for PR #8407 [ci skip] 2019-05-25 13:20:26 -05:00
kevinz000
aab5a4ae0a Merge pull request #8407 from Poojawa/sprite-fixing
Female Gendered markings and leg sprite fixes
2019-05-25 11:20:23 -07:00
kevinz000
e8742a4937 Merge pull request #8402 from CdrCross/AdvDefibProofread
Defibrillator Upgrades Proofread
2019-05-25 11:17:34 -07:00
CitadelStationBot
2bc0caa7fe Automatic changelog generation for PR #8409 [ci skip] 2019-05-25 13:13:58 -05:00
kevinz000
97609fb84e Merge pull request #8409 from Poojawa/why-is-arousal-code-is-bad
Fixes species getting genitals at all if NOGENITAL'd
2019-05-25 11:13:55 -07:00
kevinz000
16310a9aea Merge pull request #8425 from BlackMajor/Dunga
Ports TG firebots.
2019-05-25 11:13:29 -07:00
CitadelStationBot
3bf6c84779 Automatic changelog generation for PR #8420 [ci skip] 2019-05-25 13:10:22 -05:00
kevinz000
104d3c1f37 Merge pull request #8420 from deathride58/fixesblobs
Fixes shield blobs being completely invulnerable to all forms of damage after reaching a weakened state.
2019-05-25 11:10:19 -07:00
Ghommie
d8024ef36f lazyinitlist. 2019-05-25 16:32:17 +02:00
CitadelStationBot
80d95f2297 Automatic changelog generation for PR #8429 [ci skip] 2019-05-24 12:48:34 -05:00
kevinz000
c68f4324b1 Merge pull request #8429 from deathride58/fuckconcats
[s] fixes a major exploit involving concatenators
2019-05-24 10:48:32 -07:00
deathride58
9d240d3375 [s] fixes concatenator circuits being able to crash the server 2019-05-24 13:37:53 -04:00
BlackMajor
f94cbe94f6 Ports TG firebots 2019-05-24 23:58:39 +12:00
BlackMajor
e2e070d307 Merge pull request #8 from Citadel-Station-13/master
Unga me sync
2019-05-24 22:40:38 +12:00
CitadelStationBot
99372ace45 Automatic changelog generation for PR #8411 [ci skip] 2019-05-23 15:32:16 -05:00
kevinz000
05d38cc016 Merge pull request #8411 from Trilbyspaceclone/patch-134
Makes mag guns fire 3 mags before running out of power
2019-05-23 13:32:12 -07:00
deathride58
cf1acdf058 can my post-testing optimizations please at least work? 2019-05-23 13:12:31 -04:00
deathride58
4e989038e2 Fixes blob shields being completely invulnerable to all forms of damage after reaching a weakened state. 2019-05-23 12:37:46 -04:00
UntoldTactics
0cf0d4d8ed Update runes.dm 2019-05-23 18:37:17 +10:00
Trilbyspaceclone
ed23f9834a Update jetpack.dm 2019-05-22 22:19:32 -04:00
Trilbyspaceclone
fb6eca8d46 How did this even compile? 2019-05-22 21:28:16 -04:00
Trilbyspaceclone
717398213b Update pirates.dm 2019-05-22 18:52:15 -04:00
Trilbyspaceclone
e47598be8b Update jetpack.dm 2019-05-22 18:39:51 -04:00
CitadelStationBot
4c3a51a620 Automatic changelog generation for PR #8400 [ci skip] 2019-05-22 13:50:58 -05:00
Useroth
90b62234d6 Made the hotel booze-o-mat hacked by default. 2019-05-22 20:13:58 +02:00
kevinz000
b900815e90 Merge pull request #8400 from dtfe3/watcher-trophy
Watcher Wing Trophy Effect increase
2019-05-22 10:42:25 -07:00
Useroth
9441853f6d Boltable hotel. Now with mapmerge. 2019-05-22 19:28:50 +02:00