Commit Graph

21700 Commits

Author SHA1 Message Date
LetterJay 678a08e883 Update modular_citadel/code/modules/client/loadout/__donator.dm
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com>
2019-07-04 14:23:37 -05:00
Jay ad9ba89d34 Yellow out for donator 2019-07-01 12:20:52 -05:00
kevinz000 e6578fddad Merge pull request #8791 from deathride58/fuckcopypasta
Fixes master not compiling
2019-06-30 02:06:28 -07:00
deathride58 4b83110db7 fuck copypasta; Fixes master not compiling. Stop blindly copy-pasting shit from other codebases without even so much as making sure it compiles. Holy fuck. 2019-06-30 05:02:51 -04:00
kevinz000 cef22b3c5a Merge pull request #8786 from Sishen1542/jetpacc
Update jetpack.dm
2019-06-29 22:17:00 -07:00
Sishen 575f70f3b2 Update jetpack.dm 2019-06-30 01:13:37 -04:00
CitadelStationBot 796b620efe Automatic changelog generation for PR #8784 [ci skip] 2019-06-29 22:25:04 -05:00
LetterJay e8ae3eb303 Merge pull request #8784 from Trilbyspaceclone/donor_130208120381
[DONOR] MidgetDragon Trending Outfit
2019-06-29 22:25:02 -05:00
CitadelStationBot ee6b51603c Automatic changelog generation for PR #8779 [ci skip] 2019-06-29 22:09:35 -05:00
kevinz000 be377c4bda Merge pull request #8779 from Sishen1542/jetpacc
Nerfs roundstart carbon jetpacks. TAKE TWO
2019-06-29 20:09:33 -07:00
kevinz000 09c8a45fe2 Merge pull request #8770 from Arturlang/Carp_Deflecting
Carp now deflects the bullets instead of making them dissapear.
2019-06-29 20:08:47 -07:00
TrilbySpaceClone 5087b97e18 Trending spriter 2019-06-29 20:18:32 -04:00
CitadelStationBot 8e88fecf08 Automatic changelog generation for PR #8742 [ci skip] 2019-06-29 17:18:03 -05:00
kevinz000 bf6811b981 Merge pull request #8742 from Trilbyspaceclone/MW2_suit
[DF] Adds MW2 Para Trooper Jumpsuit for AWOO aka investigator77 - Donner item
2019-06-29 15:18:01 -07:00
Sishen 97241cd1e8 jetpacks, take 2 2019-06-29 00:29:49 -04:00
CitadelStationBot c3ae7e5522 Automatic changelog generation for PR #8681 [ci skip] 2019-06-28 22:36:45 -05:00
kevinz000 fbbfb02364 Merge pull request #8681 from Ghommie/Ghommie-cit64
Fixes vape and its sprites
2019-06-28 20:36:43 -07:00
CitadelStationBot 43ca342d45 Automatic changelog generation for PR #8739 [ci skip] 2019-06-28 22:32:17 -05:00
kevinz000 c495a2aa47 Merge pull request #8739 from Sishen1542/makinggolemsgreatagain
Ports additional tg golem types! Leather, cardboard, bronze & bone. Ports bone hurting juice as well!
2019-06-28 20:32:15 -07:00
CitadelStationBot d15892c99a Automatic changelog generation for PR #8729 [ci skip] 2019-06-28 22:30:46 -05:00
kevinz000 a6caf4c63f Merge pull request #8729 from Ghommie/Ghommie-cit79
Ports "Removes SSreligion"
2019-06-28 20:30:44 -07:00
CitadelStationBot c199c9abb9 Automatic changelog generation for PR #8581 [ci skip] 2019-06-28 22:30:08 -05:00
kevinz000 7e1522b76b Merge pull request #8581 from Ghommie/Ghommie-cit42
[Ready]Reskinnable PDAs.
2019-06-28 20:30:05 -07:00
CitadelStationBot 77ed7c6428 Automatic changelog generation for PR #8737 [ci skip] 2019-06-28 15:03:55 -05:00
deathride58 7e943c0f42 Merge pull request #8737 from Ghommie/Ghommie-cit85
Fixes CWC construct shells being visible as ghost role to latejoiners.
2019-06-28 16:03:53 -04:00
CitadelStationBot 48d358d364 Automatic changelog generation for PR #8728 [ci skip] 2019-06-28 12:16:27 -05:00
kevinz000 d4b9b52f10 Merge pull request #8728 from Sishen1542/JESUSFUCKFIXDISPENSERSALREADYGODDAMN
Dispensers now act like tg counterparts! Tweak to available chems in chem/soda/booze dispensers.
2019-06-28 10:16:25 -07:00
Ghommie d782f24395 change 2019-06-28 17:30:28 +02:00
Sishen 92f530eed1 left the , for diethyl when i removed saltpetre whoops 2019-06-28 08:34:35 -04:00
Sishen 84e60b1cd2 Update chem_dispenser.dm 2019-06-28 08:32:56 -04:00
CitadelStationBot bd4ba5da88 Automatic changelog generation for PR #8720 [ci skip] 2019-06-28 07:28:37 -05:00
kevinz000 6c77443887 Merge pull request #8720 from Ghommie/Ghommie-cit76
Sort of porting MRE rations from Yogstation.
2019-06-28 05:28:35 -07:00
kevinz000 8a2a0100c5 Merge pull request #8772 from Sishen1542/bibleblack
quick bible fix, per kevinz request
2019-06-28 05:27:43 -07:00
kevinz000 83f84b01a1 Merge pull request #8700 from Sishen1542/trenchcloak
Adds a reskin option for HoS tenchcoat, the trenchcloak!
2019-06-28 05:24:11 -07:00
Sishen 555c1adf67 fix per kevs request 2019-06-28 08:20:59 -04:00
Sishen 1679a2c42b Merge remote-tracking branch 'upstream/master' 2019-06-28 08:20:12 -04:00
Sishen 1386161aff Revert "Revert "Revert "Revert "Automatic changelog generation for PR #8738 [ci skip]""""
This reverts commit 3fcc884ab5.
2019-06-28 08:20:06 -04:00
Sishen 3fcc884ab5 Revert "Revert "Revert "Automatic changelog generation for PR #8738 [ci skip]"""
This reverts commit 81b9f94511.
2019-06-28 08:19:49 -04:00
CitadelStationBot e336f2db52 Automatic changelog generation for PR #8731 [ci skip] 2019-06-28 07:19:06 -05:00
kevinz000 f7bbca8918 Merge pull request #8731 from Ghommie/Ghommie-cit81
Ports in microwave updates and its radial menu.
2019-06-28 05:19:04 -07:00
CitadelStationBot a55a0b32ab Automatic changelog generation for PR #8708 [ci skip] 2019-06-28 07:18:37 -05:00
kevinz000 f76737dc04 Merge pull request #8708 from Trilbyspaceclone/patch-185
Corrects the "Durasteel" to be plastitanium tool boxes
2019-06-28 05:18:35 -07:00
CitadelStationBot a8dfecdf25 Automatic changelog generation for PR #8726 [ci skip] 2019-06-28 07:14:59 -05:00
kevinz000 ee852382f8 Merge pull request #8726 from Sishen1542/biblethump
Tweaks to chaplain bible heals. Time to pull out the old brainbuster.
2019-06-28 05:14:57 -07:00
CitadelStationBot 506b63a9c7 Automatic changelog generation for PR #8760 [ci skip] 2019-06-28 07:12:46 -05:00
kevinz000 a103611d1b Merge pull request #8760 from Trilbyspaceclone/LoudnProud
Makes ling's adrendals have a loudness 2
2019-06-28 05:12:43 -07:00
Arturlang 442c21fdba For the actual deflecting! 2019-06-28 11:41:01 +03:00
Arturlang 69a62314e9 Defines so carp reroutes the deflects 2019-06-28 11:37:12 +03:00
Arturlang eb8133cf3b Defines var
Filthy webedits, i know.
2019-06-28 11:35:00 +03:00
Sishen 81b9f94511 Revert "Revert "Automatic changelog generation for PR #8738 [ci skip]""
This reverts commit 7e9ec43834.
2019-06-28 02:33:42 -04:00