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-19 14:22:33 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,497 Commits 55 Branches 0 Tags
901b54b7e8d79d59eb51b9387d2bf4d4aaa1628c
Commit Graph

19666 Commits

Author SHA1 Message Date
Putnam
aabd0b9e79 fixing quirk removal (whoops) 2020-02-03 08:18:49 -08:00
Putnam
e4e5b651e6 making permassassin scale with dynamic 2020-02-03 08:11:03 -08:00
Putnam
88ce25a09b hopefully fixing the once-assassin 2020-02-03 08:10:45 -08:00
Putnam
72c1f60af7 and now the voting works 2020-02-03 08:10:34 -08:00
Putnam
52432ed0a7 too many dynamic changes for my sanity 2020-02-03 07:12:27 -08:00
Putnam
bc52b99758 ok putnam 2020-02-03 03:27:06 -08:00
Putnam
53cad493a7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into antag-overhaul 2020-02-03 03:17:23 -08:00
Putnam
82fbef9920 Made it real time, added to config 2020-02-03 03:13:19 -08:00
Artur
5bf1ebaa53 Initial Commit 2020-02-03 12:01:17 +01:00
kevinz000
9a1974e3b6 Update mecha.dm 2020-02-03 00:50:57 -07:00
Ghom
76e34c7e0f Update update_icons.dm 2020-02-03 08:48:12 +01:00
kevinz000
0a6e304ac2 s 2020-02-03 00:47:51 -07:00
Ghom
ccd557122c Update holosign.dm 2020-02-03 08:35:47 +01:00
Ghom
f2fd48bfd9 Update holosign.dm 2020-02-03 08:31:12 +01:00
Ghom
d5166322dc I can't believe I have done this. 2020-02-03 08:23:20 +01:00
Ghommie
84d9430ee4 PC too slow for compile. 2020-02-03 07:21:39 +01:00
Ghommie
0428b05cff Oh snap 2020-02-03 07:20:16 +01:00
Ghommie
81b5fe2de3 Further buff and fix for clown ops tearstache nade. 2020-02-03 07:08:47 +01:00
Ghommie
a365f3b499 Demodularize and nerfs mag rifles with re(?)added power cell requirements. 2020-02-03 05:16:32 +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
Ghom
aa41815119 Update logging.dm 2020-02-03 00:31:53 +01: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
f1e3261566 Update _logging.dm 2020-02-02 23:26:03 +01:00
Ghom
ff0f9b5de8 Update say_vr.dm 2020-02-02 23:24:02 +01:00
Ghom
d4aa410af0 Update atoms.dm 2020-02-02 23:18:30 +01:00
Hatterhat
ca8e40caea i mean its a stupid multiplier regardless 
thanks ghom

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-02-02 14:33:45 -06:00
Hatterhat
9190b69ba3 double whoops 2020-02-02 13:40:23 -06:00
ancientpower
937f6356ab vgstation drink sliding 2020-02-02 13:26:16 -06:00
Hatterhat
5dc971f8e8 whoops 2020-02-02 13:20:43 -06:00
deathride58
10c95fa111 Makes quick item usage (click-dragging unequipped item) require combat mode to be enabled 2020-02-02 13:38:32 -05: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
14d749bd76 Weh 2020-02-02 16:23:26 +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