Commit Graph

21716 Commits

Author SHA1 Message Date
kevinz000
ab217e81e6 Merge pull request #8781 from Sishen1542/plasteel
Adds plasteel to medical and security techfabs.
2019-07-03 13:42:22 -07:00
kevinz000
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
kevinz000
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
kevinz000
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
kevinz000
85534fa1ef Merge pull request #8793 from Ghommie/Ghommie-cit99
Fixes PDA skin preference not saving up.
2019-07-03 05:19:13 -07:00
kevinz000
06f1eb6dcd Merge pull request #8810 from Trilbyspaceclone/patch-185
Corrects  Plastitanium total object damage
2019-07-03 05:18:21 -07:00
LetterJay
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
Trilbyspaceclone
88c01dd521 I need to take a brake 2019-07-01 16:47:50 -04:00
TrilbySpaceClone
9d6c930b2c owo
Wat dis?
2019-06-30 15:47:45 -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
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
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
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