 Ghom
|
f8a2116d7d
|
Merge pull request #10866 from ancientpower/skintone-match-fix
Fixes genital skintone mismatching
|
2020-02-03 08:57:39 +01:00 |
|
|
ancientpower
|
b55b375d17
|
fixes a bug with skintone in character creation
|
2020-02-02 22:59:36 -06:00 |
|
|
kevinz000
|
2393dc26eb
|
Merge pull request #10779 from Ghommie/Ghommie-cit538
added a second macro argument to STATION_TIME and STATION_TIME_TIMESTAMP.
|
2020-02-02 16:31:59 -07:00 |
|
|
kevinz000
|
c24c83c1bd
|
Merge pull request #10835 from Ghommie/Ghommie-cit546
Something about runtime errors.
|
2020-02-02 16:31:15 -07:00 |
|
|
CitadelStationBot
|
497a691da2
|
Automatic changelog generation for PR #10836 [ci skip]
|
2020-02-02 17:31:01 -06:00 |
|
|
kevinz000
|
341430eab5
|
Merge pull request #10836 from Hatterhat/rcd-carts-engifab
adding stuff to techfabs - RCD carts, combifans
|
2020-02-02 16:30:59 -07:00 |
|
|
CitadelStationBot
|
47b8df9e91
|
Automatic changelog generation for PR #10705 [ci skip]
|
2020-02-02 12:08:59 -06:00 |
|
|
Ghom
|
6f66d76680
|
Merge pull request #10705 from kevinz000/revert_poojawa_blood_1
Cleanup/Partial revert of RGB blood ""rework""
|
2020-02-02 19:08:57 +01:00 |
|
|
CitadelStationBot
|
601f41b7f7
|
Automatic changelog generation for PR #10799 [ci skip]
|
2020-02-02 12:08:18 -06:00 |
|
|
Ghom
|
97be223b0b
|
Merge pull request #10799 from Seris02/goldentoolboxfix
makes the golden ""plastitanium"" toolbox actually plastitanium
|
2020-02-02 19:08:16 +01:00 |
|
|
Ghom
|
8a81ba9efe
|
Ok here we go.
|
2020-02-02 18:40:06 +01:00 |
|
|
Ghom
|
ee533da3d7
|
Putting GLOB.blood_reagent_types at use.
|
2020-02-02 18:34:14 +01:00 |
|
|
CitadelStationBot
|
6366606553
|
Automatic changelog generation for PR #10837 [ci skip]
|
2020-02-02 11:07:27 -06:00 |
|
|
Ghom
|
96a38e6c18
|
Merge pull request #10837 from Owai-Seek/tinytweaks
Tweaking Chef Vendor, Blood Crate, and Cake Recipe
|
2020-02-02 18:07:25 +01:00 |
|
|
CitadelStationBot
|
3cb16e083f
|
Automatic changelog generation for PR #10838 [ci skip]
|
2020-02-02 11:07:03 -06:00 |
|
|
Ghom
|
fb32b018ef
|
Merge pull request #10838 from Owai-Seek/loadout
Minor Loadout/Outfit Changes
|
2020-02-02 18:07:00 +01:00 |
|
|
Ghom
|
bb1f65813e
|
Merge pull request #10858 from Citadel-Station-13/kevinz000-patch-4
Fixes APC ui_data runtime
|
2020-02-02 18:06:44 +01:00 |
|
|
CitadelStationBot
|
0f76202f24
|
Automatic changelog generation for PR #10575 [ci skip]
|
2020-02-02 10:29:59 -06:00 |
|
|
Ghom
|
72afb709b5
|
Merge pull request #10575 from Arturlang/TGUIs_Nexties
[TESTMERGE] Properly working TGUI Next
|
2020-02-02 17:29:56 +01:00 |
|
|
Artur
|
fe92573fc3
|
Forgot this
|
2020-02-02 13:44:44 +01:00 |
|
|
Artur
|
e7ddfdd8d8
|
Merge remote-tracking branch 'upstream/master' into TGUIs_Nexties
|
2020-02-02 13:31:54 +01:00 |
|
|
CitadelStationBot
|
8058ef5ac2
|
Automatic changelog generation for PR #10829 [ci skip]
|
2020-02-02 04:16:25 -06:00 |
|
|
kevinz000
|
66a2216ef3
|
Merge pull request #10829 from Ghommie/Ghommie-cit544
Fixed and brutalized clown op slippery weapons a little.
|
2020-02-02 03:16:23 -07:00 |
|
|
CitadelStationBot
|
99dc1754af
|
Automatic changelog generation for PR #10810 [ci skip]
|
2020-02-02 04:16:04 -06:00 |
|
|
kevinz000
|
c94b5688db
|
Merge pull request #10810 from YakumoChen/ring
Adds ring jewelry
|
2020-02-02 03:16:01 -07:00 |
|
|
kevinz000
|
e0f967eaa2
|
Update apc.dm
|
2020-02-02 02:57:14 -07:00 |
|
|
CitadelStationBot
|
f4d7297450
|
Automatic changelog generation for PR #10850 [ci skip]
|
2020-02-02 03:54:56 -06:00 |
|
|
kevinz000
|
3812d2d9fa
|
Merge pull request #10850 from Ghommie/Ghommie-cit548
Fixes maploaded APC terminals direction.
|
2020-02-02 02:54:53 -07:00 |
|
|
kevinz000
|
33577e0d82
|
Merge pull request #10813 from Ghommie/Ghommie-cit540
Unicode support updates from tgstation.
|
2020-02-02 01:47:24 -07:00 |
|
|
CitadelStationBot
|
24e7ee820f
|
Automatic changelog generation for PR #10784 [ci skip]
|
2020-02-02 02:47:01 -06:00 |
|
|
kevinz000
|
2cdf7fa0bb
|
Merge pull request #10784 from Seris02/polycoats
polychromic winter coats
|
2020-02-02 01:46:58 -07:00 |
|
|
kevinz000
|
dd0e78810e
|
Merge pull request #10818 from Ghommie/Ghommie-cit543
Port "Add extensions.json for vscode" & co.
|
2020-02-02 01:45:54 -07:00 |
|
|
CitadelStationBot
|
34d895e45d
|
Automatic changelog generation for PR #10834 [ci skip]
|
2020-02-02 02:43:34 -06:00 |
|
|
kevinz000
|
88c20b1ea5
|
Merge pull request #10834 from Trilbyspaceclone/patch-273
Craftable Crates!
|
2020-02-02 01:43:32 -07:00 |
|
|
CitadelStationBot
|
dd81691ce1
|
Automatic changelog generation for PR #10820 [ci skip]
|
2020-02-02 02:39:33 -06:00 |
|
|
kevinz000
|
aaa7733cec
|
Merge pull request #10820 from Ghommie/Ghommie-cit542
clown ops uplink consistency.
|
2020-02-02 01:39:31 -07:00 |
|
|
CitadelStationBot
|
c10c657222
|
Automatic changelog generation for PR #10819 [ci skip]
|
2020-02-02 02:39:10 -06:00 |
|
|
kevinz000
|
3fc832fbe7
|
Merge pull request #10819 from Ghommie/Ghommie-cit541
clown ops infiltrator consistency.
|
2020-02-02 01:39:08 -07:00 |
|
|
CitadelStationBot
|
6be65ecf3a
|
Automatic changelog generation for PR #10833 [ci skip]
|
2020-02-02 02:38:54 -06:00 |
|
|
kevinz000
|
c9de66857e
|
Merge pull request #10833 from Ghommie/Ghommie-cit545
Playback device spam peeve.
|
2020-02-02 01:38:52 -07:00 |
|
|
CitadelStationBot
|
4103adb2e9
|
Automatic changelog generation for PR #10831 [ci skip]
|
2020-02-02 02:38:36 -06:00 |
|
|
kevinz000
|
664c4cdea9
|
Merge pull request #10831 from Citadel-Station-13/Ghommie-patch-1
Fixing chaplain armaments beacon edge case.
|
2020-02-02 01:38:34 -07:00 |
|
|
kevinz000
|
e97af26236
|
ok ghom
|
2020-02-02 01:37:11 -07:00 |
|
|
kevinz000
|
38ec4f0e11
|
Update blood.dm
|
2020-02-02 01:35:38 -07:00 |
|
|
kevinz000
|
b59dd11adc
|
Update blood.dm
|
2020-02-02 01:35:16 -07:00 |
|
|
kevinz000
|
333c0dd201
|
Update modular_citadel/code/modules/reagents/reagents/cit_reagents.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
|
2020-02-02 01:32:54 -07:00 |
|
|
Seris02
|
d3d4a9f05b
|
Update code/modules/uplink/uplink_items/uplink_roles.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
|
2020-02-02 12:21:32 +08:00 |
|
|
Seris02
|
8053e43838
|
Update code/modules/uplink/uplink_items/uplink_roles.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
|
2020-02-02 12:21:26 +08:00 |
|
|
Ghommie
|
cbcb9f32ba
|
Fixes maploaded APC terminals direction.
|
2020-02-02 04:21:30 +01:00 |
|
|
Hatterhat
|
e985d21ea3
|
fucking combifan
|
2020-02-01 20:23:01 -06:00 |
|