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-20 06:43:02 +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
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
Trilbyspaceclone
6b2a8d49c9 Update science.dm 2020-02-02 01:39:25 -05:00
Seris02
659110ac8c yee again 2020-02-02 13:44:45 +08:00
Seris02
4c2e702d7a yee 2020-02-02 13:18:26 +08:00
Putnam
dd63e8cf84 oofies 2020-02-01 21:07:21 -08:00
Putnam
e812844c70 Revert "</span>" 
This reverts commit d6d01d848c.
 2020-02-01 21:05:27 -08:00
Ghommie
fedb05b3be A PR about runtime errors 2020-02-02 05:43:38 +01: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
Seris02
d89e0de32c yeehaw 2020-02-02 11:43:20 +08:00
Ghom
5b91908674 Fixing little blood bank gnerator examine runtime. 2020-02-02 04:27:17 +01:00
Ghommie
cbcb9f32ba Fixes maploaded APC terminals direction. 2020-02-02 04:21:30 +01:00
Ghommie
8de11845d5 Removing a troublesome argument from organ/Remove() in favor or using the 'owner' variable 2020-02-02 03:39:49 +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
Ghom
79387149a0 Fixes Space Ninja "Nothing" Objective. 2020-02-01 23:23:17 +01:00
Hatterhat
471deba88c large rcd carts 5head 2020-02-01 13:26:43 -06:00
Hatterhat
81cf670729 shit whoops 2020-02-01 13:22:16 -06:00
Putnam
c829d97418 whoops 2020-02-01 11:18:22 -08:00
Ghom
f6e30ee6aa Merge pull request #10841 from Kraseo/boxing 
Fixes being able to pull after wearing boxing gloves
 2020-02-01 19:13:30 +01:00
Ghom
d19b7a7695 Merge pull request #10744 from r4d6/Moar-Engines 
Moar engines!
 2020-02-01 19:11:10 +01:00
Kraseo
d70665a0c3 got asked to do this 2020-02-01 19:03:35 +01:00
Putnam
8d5839c2d2 up to 100 it is then 2020-02-01 10:01:49 -08:00
Ghom
6ae5ffddb1 Merge pull request #10731 from necromanceranne/howdoiswitchhands 
Energy crossbow changed from RNG to static effects
 2020-02-01 18:58:03 +01:00
Ghom
d523cfd95e Merge pull request #10806 from Feasel/master 
[Balance Patch - Tend Wounds Edition]
 2020-02-01 18:54:18 +01:00
Ghom
74ad10355c Merge pull request #10805 from Citadel-Station-13/i-hate-dueling 
guns/ammo/projectiles now properly clean up while being deleted
 2020-02-01 18:52:47 +01:00
Kraseo
aa2e4299e2 my grug brain took more than 10 attempts to get this to work 2020-02-01 18:51:18 +01:00
Ghom
3337181cac Merge pull request #10352 from Seris02/smchanges 
Changes to the way SM handles power related to integrity and max integrity damage
 2020-02-01 18:46:10 +01:00
Ghom
051811ed46 Merge pull request #10811 from Arturlang/crafting_componitization 
[READY]Ports TG updates to crafting and componentizes it
 2020-02-01 18:36:51 +01:00
Ghom
45af9dc013 Merge pull request #10808 from Arturlang/macros_begone 
[READY] Ports chem dispenser macro recording
 2020-02-01 18:22:57 +01:00
Putnam
3dcce2b43a added some cleanup code 2020-02-01 09:10:02 -08:00
Putnam
aba0379bfb also need these! 2020-02-01 08:53:19 -08:00
Putnam
463036a4f4 made panic bunker save in json 2020-02-01 08:44:05 -08:00
Putnam
d6d01d848c </span> 2020-02-01 06:01:54 -08:00
Artur
11fea908bd Fix and rebalance a lil 2020-02-01 14:11:34 +01:00
Putnam3145
12f0c35660 Merge pull request #10803 from Seris02/highlightfix 
fixes the whitespace that gets created when you have highlighting strings on
 2020-02-01 04:15:47 -08:00
Putnam3145
17e08280b1 Merge pull request #10804 from Citadel-Station-13/kevinz000-patch-9 
fixes a very likely race condition in dueling pistols
 2020-02-01 04:15:32 -08:00
Winter Flare
59b5b0b9a6 A bunch of tiny tweaks. 
Added additional blood types to blood crate.
Added Soy Sauce packet.
Added Soy Sauce and BBQ packet to chef vendor.
Changed Birthday Cake recipie to mirror TG.
 2020-02-01 04:49:56 -05:00
Ghom
ed3ebd16a8 Merge pull request #10830 from Seris02/nomoreglitches 
[s] fixes a glitch with the PKA
 2020-02-01 10:06:58 +01:00
Putnam3145
33122d0d92 Merge branch 'master' into TGUIs_Nexties 2020-02-01 00:49:10 -08:00
Putnam
50a53c6558 aaand a formatting oddity 2020-02-01 00:47:44 -08:00
Putnam
7e3ea27ff4 dumb formatting. dumb dumb. 2020-02-01 00:42:25 -08:00
Putnam
847e6382c0 fixes some quirk stuff 2020-02-01 00:32:08 -08:00