cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-11 02:12:14 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,577 Commits 55 Branches 0 Tags
6cc6aa12be9cb40360ea4a7c0b0202bf259e5ccd
Commit Graph

19012 Commits

Author SHA1 Message Date
Seris02
6cc6aa12be yeehaw it's done 2020-02-05 16:54:57 +08:00
Seris02
49f80d52a8 bug fixes 2020-02-04 17:18:45 +08:00
Ghom
d451115bf1 Merge pull request #10854 from Seris02/meteoralertchange 
Makes a proc for meteor string gen
 2020-02-04 08:15:32 +01:00
Seris02
0e13afc10f yeet 2020-02-04 13:25:14 +08:00
Seris02
8f70bd304d yee 2020-02-04 13:24:30 +08:00
Ghom
cc3955ecc7 Fixes pitch black characters 2020-02-04 06:04:43 +01:00
Ghom
bb3505c184 Merge pull request #10852 from MrJWhit/Comments-out-meteor-defense-tech-node 
Comments out meteor defense tech node
 2020-02-04 05:26:25 +01:00
Ghom
33ef9b4619 Update all_nodes.dm 2020-02-04 05:15:52 +01:00
Ghom
6a88e37ff2 Merge pull request #10801 from Seris02/risingbasschanges 
changes to rising bass
 2020-02-04 05:14:07 +01:00
Ghom
6de00c21f0 Update dna_console.dm 2020-02-04 04:11:21 +01:00
Ghom
5df6566f01 Update clown_weapons.dm 2020-02-03 20:44:58 +01:00
Ghom
40f7a72e3c Update slippery.dm 2020-02-03 20:32:50 +01:00
Ghom
3cb1a0e9c8 Update slippery.dm 2020-02-03 20:31:57 +01: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
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
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
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
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
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
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
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
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
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
kevinz000
2cdf7fa0bb Merge pull request #10784 from Seris02/polycoats 
polychromic winter coats
 2020-02-02 01:46:58 -07:00
kevinz000
88c20b1ea5 Merge pull request #10834 from Trilbyspaceclone/patch-273 
Craftable Crates!
 2020-02-02 01:43:32 -07:00
kevinz000
aaa7733cec Merge pull request #10820 from Ghommie/Ghommie-cit542 
clown ops uplink consistency.
 2020-02-02 01:39:31 -07:00
kevinz000
3fc832fbe7 Merge pull request #10819 from Ghommie/Ghommie-cit541 
clown ops infiltrator consistency.
 2020-02-02 01:39:08 -07:00
kevinz000
c9de66857e Merge pull request #10833 from Ghommie/Ghommie-cit545 
Playback device spam peeve.
 2020-02-02 01:38:52 -07: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
Seris02
659110ac8c yee again 2020-02-02 13:44:45 +08:00
Seris02
4c2e702d7a yee 2020-02-02 13:18:26 +08:00
MrJWhit
d314619d0e Comments out meteor defense tech node 
asdf
 2020-02-01 23:34:33 -05: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
Seris02
18489e5b65 merge fixes 2020-02-02 11:51: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
Ghom
2bb0a0311a Merge pull request #10796 from Tupinambis/StatusBugFix 
Status Display Fix: It's About Time
 2020-02-02 01:51:07 +01:00
Ghom
d6c36f363e Merge pull request #10817 from IronEleven/ViroStatPort 
Updates Virus Symptom Stats to Match TG
 2020-02-02 01:41:11 +01:00
Hatterhat
471deba88c large rcd carts 5head 2020-02-01 13:26:43 -06:00