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-18 13:53:18 +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
kappa-sama
8c2019fcbf probably fixes plant disk techdisk 2020-02-07 17:58:36 -05:00
Ghom
71f44a7085 Merge pull request #10892 from kevinz000/small_guncode_refactor 
Small guncode refactor but it works
 2020-02-07 23:13:21 +01:00
Ghom
9c14d03051 Merge pull request #10774 from Citadel-Station-13/kevinz000-patch-2 
nuke explosion is 512 dev which is actually less laggy than heavy + light
 2020-02-07 22:44:20 +01:00
Ghom
1dfba9f416 Merge pull request #10957 from Putnam3145/fix-occasional-dynamic-runtime 
Fixes a spurious dynamic runtime if nobody votes
 2020-02-07 22:41:48 +01:00
Lin
5717700146 Merge pull request #10925 from Ghommie/Ghommie-cit558 
runtime is forever, errors are eternal.
 2020-02-07 17:29:49 +00:00
Putnam
b4faac50a9 yeah "null" is bad juju. why did i do that 2020-02-07 04:41:16 -08:00
Putnam
27efd54274 why was that else there. why 2020-02-07 04:38:39 -08:00
Putnam
7f0a369870 Also added options for custom votes 2020-02-07 04:29:53 -08:00
Ghom
0e778fc2be Merge pull request #10956 from Arturlang/bloodsucker_cloak_fix 
[s]Fixes bloodsucker cloak
 2020-02-07 13:29:21 +01:00
Artur
41eebc6e2b Fixes cloak 2020-02-07 13:42:56 +02:00
kevinz000
673079f995 Update gravity.dm 2020-02-07 03:31:15 -07:00
kevinz000
b5d6afac9a Update gravity.dm 2020-02-07 03:20:45 -07:00
kevinz000
0337a6402b Update wizard.dm 2020-02-07 03:16:52 -07:00
Ghom
7b23ca3827 Merge pull request #10951 from Citadel-Station-13/kevinz000-patch-10 
fail2topic runtime fix
 2020-02-07 10:34:55 +01:00
Ghom
2ebf758347 Merge pull request #10950 from Citadel-Station-13/kevinz000-patch-9 
beam rifle sanity update
 2020-02-07 10:17:14 +01:00
Seris02
4ec99a38e2 merge fixes 2020-02-07 15:28:05 +08:00
kevinz000
4f2acb6298 Update gun.dm 2020-02-07 00:08:19 -07:00
kevinz000
e6f14a085d Update fail2topic.dm 2020-02-07 00:06:32 -07:00
kevinz000
ed2bfb66d8 Update fail2topic.dm 2020-02-07 00:05:21 -07:00
kevinz000
15a59dd729 Merge pull request #10921 from Ghommie/Ghommie-cit557 
Lavaland's Herald speech fix.
 2020-02-06 23:56:13 -07:00
kevinz000
de2a3c5502 Merge pull request #10787 from Seris02/snatchgloves 
thief's gloves
 2020-02-06 23:53:54 -07:00
kevinz000
3f5805a9e8 Merge pull request #10798 from necromanceranne/secmainsrejoice 
Formal security wear are now armor vests (HAS SOME BALANCE CONCERNS)
 2020-02-06 23:52:49 -07:00
kevinz000
4e2e411dd0 Merge pull request #10929 from Ghommie/Ghommie-cit559 
Double-esword and hypereuplastic blade toys are now blunt.
 2020-02-06 23:51:17 -07:00
kevinz000
ae199cee28 Update beam_rifle.dm 2020-02-06 23:49:36 -07:00
kevinz000
353c13631a Update beam_rifle.dm 2020-02-06 23:34:33 -07:00
Ghom
e7e13e99b8 Update apc.dm 2020-02-07 07:32:06 +01:00
Ghom
fc1c97b6c6 [s] Prevents some unachievable discounts. 2020-02-07 06:11:20 +01:00
Ghom
cee2410091 Merge pull request #10922 from Citadel-Station-13/kevinz000-patch-5 
renames the lawyer cartridge to something more accurate to its function
 2020-02-07 05:53:09 +01:00
Ghommie
83a08ee9f5 Extras and tg#45018 2020-02-07 05:21:08 +01:00
Ghommie
86c472eaf6 the holopad fix. 2020-02-07 03:17:00 +01:00
Ghommie
2d8f85d810 A few nuisances solved. 2020-02-07 02:59:59 +01:00
Ghommie
cd339348c9 Also an unwarranted underscore. 2020-02-07 01:22:32 +01:00
Putnam
0ebd2a814f fixed spurious divide-by-zero 2020-02-06 16:11:14 -08:00
Putnam
edcdb531cc kwargs 2020-02-06 15:57:42 -08:00
Putnam
e6d353dd01 that's not how switch works... 2020-02-06 15:56:58 -08:00
Putnam
d05c2426a8 Added a config for map voting types. 2020-02-06 15:47:04 -08:00
kevinz000
62b0e62952 Merge pull request #10623 from Putnam3145/antag-overhaul 
Better antag objectives: for real this time
 2020-02-06 16:25:22 -07:00
Ghommie
16b655b887 Adds the ELEMENT_DETACH flag to two elements 2020-02-06 23:19:21 +01:00
Ghommie
04261345dd export scanners. 2020-02-06 23:08:32 +01:00
Ghommie
0703c6eea6 First tweak to cargo reagents selling. 2020-02-06 22:34:54 +01:00
Ghom
ce6b37da1e Merge pull request #10920 from Arturlang/debbuging 
Adds vscode debbuging
 2020-02-06 20:33:21 +01:00
Ghom
cd14f13d0d Merge pull request #10917 from Arturlang/Hyposprays_QOL 
Removes the hypospray verb for toggling spray/inject mode and makes it into an Alt click proc.
 2020-02-06 20:31:46 +01:00
Arturlang
0353f1602d Fixes ore boxes 2020-02-06 20:10:02 +01:00
Artur
c9dc35fd9a Updates the debug outfit 2020-02-06 18:42:23 +01:00
kevinz000
57f6ad5e87 Update login.dm 2020-02-06 05:46:31 -07:00
kevinz000
7898dd089e Merge pull request #10888 from Ghommie/Ghommie-cit554 
Ports "Cleans up plante gene mutability."
 2020-02-06 00:49:09 -07:00
kevinz000
3cd3578761 wrong var 2020-02-06 00:44:28 -07:00
kevinz000
fe2007d687 Merge pull request #10870 from Citadel-Station-13/Ghommie-patch-5 
Fixed wheelchair-goers appearing as shoeless
 2020-02-06 00:43:45 -07:00
kevinz000
75d3a8b35d Merge pull request #10868 from Citadel-Station-13/Ghommie-patch-4 
Holofans visual tweak.
 2020-02-06 00:42:39 -07:00
kevinz000
542cae89d4 Merge pull request #10906 from Hatterhat/tg-48717-48726 
husking is stupid - 5u rezadone/100u synthflesh heals husking, husking takes more burn
 2020-02-06 00:42:05 -07:00