Commit Graph
21735 Commits
Author SHA1 Message Date
kevinz000andGitHub e62213a6cd Merge pull request #8775 from Ghommie/Ghommie-cit95
crew monitor indexing pet peeve.
2019-07-03 13:45:34 -07:00
CitadelStationBot 4cdd3c5f5e Automatic changelog generation for PR #8776 [ci skip] 2019-07-03 15:45:05 -05:00
kevinz000andGitHub 10a584c71f Merge pull request #8776 from Ghommie/Ghommie-cit96
Porting in donut fixes, beepsky smash and Neurotoxin reworks.
2019-07-03 13:45:02 -07:00
CitadelStationBot 9da6687d1b Automatic changelog generation for PR #8798 [ci skip] 2019-07-03 15:44:36 -05:00
kevinz000andGitHub d78bd7399b Merge pull request #8798 from Sishen1542/action-button-swaps
Action button swapping
2019-07-03 13:44:34 -07:00
CitadelStationBot f9be8eb33a Automatic changelog generation for PR #8801 [ci skip] 2019-07-03 15:44:08 -05:00
kevinz000andGitHub a689f6b6cb Merge pull request #8801 from Sishen1542/brapfactory
Updated miasma canister sprites
2019-07-03 13:44:05 -07:00
CitadelStationBot d31156a503 Automatic changelog generation for PR #8783 [ci skip] 2019-07-03 15:42:52 -05:00
kevinz000andGitHub 78357018d6 Merge pull request #8783 from Ghommie/Ghommie-cit98
Fixing some emergency pod storage refactor fuck ups.
2019-07-03 13:42:49 -07:00
CitadelStationBot 467b1351a7 Automatic changelog generation for PR #8781 [ci skip] 2019-07-03 15:42:24 -05:00
kevinz000andGitHub ab217e81e6 Merge pull request #8781 from Sishen1542/plasteel
Adds plasteel to medical and security techfabs.
2019-07-03 13:42:22 -07:00
kevinz000andGitHub 9654308a94 Merge pull request #8809 from Ghommie/Ghommie-cit103
Quickfixing latejoin ghost roles, I'm sorry.
2019-07-03 09:52:14 -07:00
CitadelStationBot cf7725233c Automatic changelog generation for PR #8799 [ci skip] 2019-07-03 11:51:49 -05:00
kevinz000andGitHub 948bba1274 Merge pull request #8799 from Trilbyspaceclone/Cargo_lewds
Adds Promiscuous Organs crate to cargo
2019-07-03 09:51:47 -07:00
CitadelStationBot 670d1f8743 Automatic changelog generation for PR #8797 [ci skip] 2019-07-03 07:20:40 -05:00
kevinz000andGitHub 0f0d5323a3 Merge pull request #8797 from Sishen1542/rotate-emitters
Emitters can be rotated instead of only flipped
2019-07-03 05:20:37 -07:00
CitadelStationBot 71ef69b76c Automatic changelog generation for PR #8793 [ci skip] 2019-07-03 07:19:15 -05:00
kevinz000andGitHub 85534fa1ef Merge pull request #8793 from Ghommie/Ghommie-cit99
Fixes PDA skin preference not saving up.
2019-07-03 05:19:13 -07:00
kevinz000andGitHub 06f1eb6dcd Merge pull request #8810 from Trilbyspaceclone/patch-185
Corrects  Plastitanium total object damage
2019-07-03 05:18:21 -07:00
Ghommie 1fd50cc15a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit96 2019-07-03 04:52:57 +02:00
LetterJayandGitHub d01eb661cd Merge pull request #8813 from Citadel-Station-13/bedsheet
Bedsheet for Donator [T2]
2019-07-02 10:39:15 -05:00
Jay e4ecb2894a bedsheet for donator 2019-07-02 09:41:04 -05:00
Ghommie 33687dc2bc I'm an idiot, I need to pick an element within the list, not the list itself!! 2019-07-01 22:53:42 +02:00
Ghommie d0a001f663 Quickfixing latejoin ghost roles, I'm sorry. 2019-07-01 22:47:51 +02:00
TrilbyspacecloneandGitHub 88c01dd521 I need to take a brake 2019-07-01 16:47:50 -04:00
Sishen a6f1d62c09 whoops accidentally left proto cans in 2019-06-30 16:26:41 -04:00
Sishen 6105f19c37 Update atmos.dmi 2019-06-30 16:20:54 -04:00
TrilbySpaceClone 9d6c930b2c owo
Wat dis?
2019-06-30 15:47:45 -04:00
Sishen b2d5ec8d0c Update action_button.dm 2019-06-30 15:42:04 -04:00
Sishen 2047d86095 Update emitter.dm 2019-06-30 15:33:34 -04:00
Ghommie c569da5713 Fixes PDA skin preference not saving up. 2019-06-30 17:17:23 +02:00
kevinz000andGitHub 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
kevinz000andGitHub 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
LetterJayandGitHub 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
kevinz000andGitHub be377c4bda Merge pull request #8779 from Sishen1542/jetpacc
Nerfs roundstart carbon jetpacks. TAKE TWO
2019-06-29 20:09:33 -07:00
kevinz000andGitHub 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
Ghommie dc20b605fb Fixing some emergency pod storage refactor fuck ups. 2019-06-30 00:40:39 +02:00
CitadelStationBot 8e88fecf08 Automatic changelog generation for PR #8742 [ci skip] 2019-06-29 17:18:03 -05:00
kevinz000andGitHub 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 3aaed75a95 Update smelting_designs.dm 2019-06-29 04:49:29 -04: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
kevinz000andGitHub 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
kevinz000andGitHub 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