Commit Graph
21320 Commits
Author SHA1 Message Date
kevinz000andGitHub d9119d43f0 Merge pull request #8627 from BlackMajor/MeMapGood
Adds more space ruins.
2019-06-16 19:29:23 -07:00
CitadelStationBot 12c3fb32df Automatic changelog generation for PR #8618 [ci skip] 2019-06-16 21:29:06 -05:00
kevinz000andGitHub 9e85eb5757 Merge pull request #8618 from Trilbyspaceclone/Magless
Corrects ammo boxes spawning, as well as buffs cargo shotgun crates
2019-06-16 19:29:04 -07:00
kevinz000andGitHub 89dd3d4e87 Merge pull request #8657 from BlackMajor/Dunga
HAHA WHOOPS I ACCIDENTALLY NUKED IT
2019-06-16 03:11:26 -07:00
BlackMajor 979455d86a HAHA WHOOPS 2019-06-16 22:10:00 +12:00
CitadelStationBot 4a88cce82e Automatic changelog generation for PR #8565 [ci skip] 2019-06-16 03:19:53 -05:00
kevinz000andGitHub 6149a44408 Merge pull request #8565 from SkullyRoberts/NudityPermit
Ported the nudity permit from RP and made it a loadout option. You're welcome, Everoth
2019-06-16 01:19:51 -07:00
kevinz000andGitHub b0264414b2 Merge pull request #8576 from Sishen1542/whipcrack
Whips are long again (except yours, curator)
2019-06-16 01:18:37 -07:00
CitadelStationBot d91700dcfe Automatic changelog generation for PR #8591 [ci skip] 2019-06-16 03:16:15 -05:00
kevinz000andGitHub 1408a453de Merge pull request #8591 from Ghommie/Ghommie-cit43
You smell that? Napalm, son.
2019-06-16 01:16:12 -07:00
CitadelStationBot 743ac969e6 Automatic changelog generation for PR #8479 [ci skip] 2019-06-16 03:13:10 -05:00
kevinz000andGitHub 1c46bcef7e Merge pull request #8479 from Ghommie/Ghommie-cit21
Krav maga leg sweep tweak.
2019-06-16 01:13:08 -07:00
kevinz000andGitHub 0dc9d92b8b Merge pull request #8596 from Poojawa/ball-fixes
fixes testicle runtimes
2019-06-16 01:12:08 -07:00
kevinz000andGitHub 9c0cc52771 Merge pull request #8600 from Sishen1542/plushsalt
Makes plushies not a 2% prize from the arcades
2019-06-16 01:11:37 -07:00
CitadelStationBot 52db8135bc Automatic changelog generation for PR #8605 [ci skip] 2019-06-16 03:11:13 -05:00
kevinz000andGitHub 12ecaf63ee Merge pull request #8605 from Trilbyspaceclone/patch-174
Adds medical breifcases
2019-06-16 01:11:11 -07:00
CitadelStationBot fe62b961a2 Automatic changelog generation for PR #8640 [ci skip] 2019-06-16 03:10:49 -05:00
kevinz000andGitHub 5d8286f91c Merge pull request #8640 from Trilbyspaceclone/more_cooking1
Makes baklava pie
2019-06-16 01:10:47 -07:00
kevinz000andGitHub 8e10286fd6 Merge pull request #8484 from BlackMajor/Dunga
Adds bluespace compression kit and superglue
2019-06-16 01:10:25 -07:00
BlackMajorandGitHub 0294cba855 Merge pull request #8213 from Citadel-Station-13/kevinz000-patch-33
shuttle purchase announcements are no longer delayed by mapload's blocking proccall
2019-06-16 20:09:15 +12:00
CitadelStationBot 9af1ce97f8 Automatic changelog generation for PR #8623 [ci skip] 2019-06-16 03:08:50 -05:00
kevinz000andGitHub c6bdb74c6a Merge pull request #8623 from Arturlang/RD_ROD_SUPLEX
RD can now suplex a immovable rod.
2019-06-16 01:08:48 -07:00
kevinz000andGitHub 3f39e5a8bc Merge pull request #8598 from Poojawa/patch-1
Fixes Gulag point rewards upon inserting sheets
2019-06-16 01:08:17 -07:00
kevinz000andGitHub 6598688dd7 Merge pull request #8604 from Sishen1542/Scrubswasagoodshow
New loadout options: striped dress, bunny ears! & scrubs for MDs
2019-06-16 01:06:39 -07:00
CitadelStationBot 7ed360e54f Automatic changelog generation for PR #8645 [ci skip] 2019-06-16 03:04:11 -05:00
kevinz000andGitHub fa9c74cfa3 Merge pull request #8645 from Ghommie/Ghommie-cit49
stops borgs from sprinting into negative cell charge.
2019-06-16 01:04:09 -07:00
CitadelStationBot e8f0656615 Automatic changelog generation for PR #8639 [ci skip] 2019-06-16 03:03:36 -05:00
kevinz000andGitHub 4135bcfa77 Merge pull request #8639 from Useroth/ninja-shit
Ninja tweaks and improvements. Take two.
2019-06-16 01:03:34 -07:00
kevinz000andGitHub d3555d6782 Merge pull request #8243 from Trilbyspaceclone/meteor
More Meteor defenses
2019-06-16 01:01:43 -07:00
BlackMajor 5c99bbbd45 Undoing first step into scaling damage for fullmerge reasons 2019-06-16 20:00:31 +12:00
deathride58andGitHub 88a8db87c2 Merge pull request #8612 from BlackMajor/Ooga
Makes a small adjustment to the ash walker camp.
2019-06-15 21:29:55 -04:00
Ghommie 05066f241b Improving keborgs' movement, not removing. 2019-06-15 20:33:38 +02:00
BlackMajor 9219a2c813 Adding more ruins 2019-06-15 21:17:34 +12:00
BlackMajor 4528384976 Fuck it lets add way more spiciest PR 2019-06-15 19:03:04 +12:00
Ghommie 280e7d7d81 stops borgs from sprinting into negative cell charge. 2019-06-15 04:36:40 +02:00
LetterJayandGitHub 0a144545c5 Merge pull request #8625 from Trilbyspaceclone/Donator-1
Blue Kimono for SFox63 - Donator
2019-06-14 21:18:28 -05:00
CitadelStationBot c43d96e21c Automatic changelog generation for PR #8611 [ci skip] 2019-06-14 19:50:07 -05:00
deathride58andGitHub fdc0e4f957 Merge pull request #8611 from Poojawa/digitigrade-socks
Digitigrade socks
2019-06-14 20:50:05 -04:00
deathride58andGitHub b1f1b2a57d Merge pull request #8609 from Poojawa/simple_mob_nomming-I-guess
Client check to possibly fix #8542
2019-06-14 20:49:28 -04:00
CitadelStationBot 0d5c54b1b7 Automatic changelog generation for PR #8634 [ci skip] 2019-06-14 19:44:21 -05:00
deathride58andGitHub d79a58b3f4 Merge pull request #8634 from Ghommie/Ghommie-cit46
fixes low-charge stunbatons & co.
2019-06-14 20:44:19 -04:00
Ghommie a3c2ed0b52 fixes. 2019-06-15 02:19:57 +02:00
deathride58andGitHub 2f47fbdd8b Merge pull request #8628 from BlackMajor/Pie
Cream Pies now transfer a portion of their reagents on hitting someone
2019-06-14 19:18:12 -04:00
CitadelStationBot 48b4156fb6 Automatic changelog generation for PR #8633 [ci skip] 2019-06-14 18:08:52 -05:00
deathride58andGitHub fc332880c4 Merge pull request #8633 from Arturlang/Atmos_Updates
Examine text for pumps and typo fixes.
2019-06-14 19:08:50 -04:00
TrilbyspacecloneandGitHub f32291146b Update all_nodes.dm 2019-06-14 12:02:55 -04:00
TrilbyspacecloneandGitHub c5e3010cfa Update misc_designs.dm 2019-06-14 12:01:52 -04:00
CitadelStationBot 7433293a3e Automatic changelog generation for PR #8624 [ci skip] 2019-06-14 10:53:05 -05:00
kevinz000andGitHub 6fdb0670ee Merge pull request #8624 from Arturlang/Fix_High_Alarm_ERT_Suit
[READY] Fixes High Alert ERT suits
2019-06-14 08:53:02 -07:00
UserothandGitHub ec1ff9ada3 The joy of making an error in a webedit. 2019-06-14 13:05:36 +02:00