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-10 18:02:57 +00:00
Code Issues Packages Projects Releases Wiki Activity
34,298 Commits 55 Branches 0 Tags
95b8cd3956c3375acd3e76589b24082ba0f3d023
Commit Graph

7976 Commits

Author SHA1 Message Date
kevinz000
830e1b46c8 Merge pull request #12028 from Putnam3145/fix-story-storyteller 
Some more admeme potential for dynamic
 2020-04-29 12:02:21 -07:00
kevinz000
57ab38185f Merge pull request #12014 from Trilbyspaceclone/patch-358 
Buffs shoulder holsters
 2020-04-29 12:00:03 -07:00
Lin
64a5831a28 Merge pull request #12044 from Citadel-Station-13/kevinz000-patch-2 
Fixes cybernetics not updating slowdowns when dropping shield
 2020-04-29 01:07:55 +00:00
ZeroMan
18eb42315e i missed a src 2020-04-28 02:55:25 -04:00
ZeroMan
8dc130175d i actually despise coding 2020-04-28 02:46:46 -04:00
Lin
68bad2ee3f Merge pull request #12033 from Citadel-Station-13/kevinz000-patch-6 
fixes shield bashing working while downed
 2020-04-27 16:24:29 +00:00
TrilbySpaceClone
5d6da47db7 Merge branch 'master' into medical-witchcraft 2020-04-27 07:25:18 -04:00
kevinz000
4e8a8dbebd Update items.dm 2020-04-27 02:55:11 -07:00
kevinz000
f70490c61d fixes 2020-04-26 04:40:18 -07:00
kevinz000
2e35a42f43 wow lotsa effort huh 2020-04-26 04:10:38 -07:00
kevinz000
ff9f18bdbd wow lotsa effort huh 2020-04-26 03:38:41 -07:00
kevinz000
bf7962d8f9 wow lotsa effort huh 2020-04-26 03:36:09 -07:00
kevinz000
aeaf6ea102 wow lotsa effort huh 2020-04-26 03:33:08 -07:00
kevinz000
e3b987879e wow lotsa effort huh 2020-04-26 03:30:18 -07:00
kevinz000
a9d0ce45b9 wow lotsa effort huh 2020-04-26 03:29:43 -07:00
kevinz000
af3651172c wow lotsa effort huh 2020-04-26 03:29:31 -07:00
Putnam
00c2ddce8f Actually this is better 2020-04-25 23:18:37 -07:00
Putnam
3da4701dff Switch roundstart thing to initial. 2020-04-25 23:06:15 -07:00
kevinz000
5c20bde9f0 Update shields.dm 2020-04-25 20:58:22 -07:00
Putnam
257de9d4c9 Adds uplinks back to nukies. 2020-04-25 19:22:55 -07:00
Putnam
d7c0834794 A couple important comments. 2020-04-25 17:22:12 -07:00
Putnam
b9e88f85bb Allowed better admeme stuff for dynamic 2020-04-25 17:15:17 -07:00
kevinz000
565bfdb7b0 Merge pull request #11959 from Trilbyspaceclone/patch-351 
Nerfs spiders defence stat against flyswatters - Alt  Australian crew buff.
 2020-04-25 17:10:33 -07:00
kevinz000
af08e0fecf Merge pull request #11984 from Hatterhat/fastpump 
The Neo-Russian Rifleman's Primer - a book that makes you pump shotguns and work rifle bolts faster
 2020-04-25 17:07:29 -07:00
kevinz000
d7f38faab9 Merge pull request #11971 from Putnam3145/fix-story-storyteller 
More dynamic tweaks
 2020-04-25 17:05:38 -07:00
kevinz000
da61b04ed0 Merge pull request #11997 from Ghommie/Ghommie-cit705 
code for designs' security level requirements.
 2020-04-25 16:53:48 -07:00
kevinz000
4689e2aeb6 Merge pull request #11980 from Ghommie/Ghommie-cit700 
Movespeed modifiers refactor port.
 2020-04-25 16:51:14 -07:00
Lin
499e71c528 Merge pull request #11993 from Ghommie/Ghommie-cit704 
porting CEV-Eris pickweight procs.
 2020-04-25 18:30:26 +00:00
Ghommie
94f014589d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685 2020-04-25 17:09:34 +02:00
Ghommie
fecf6cef2f Coin can be inserted in ID cards now. 2020-04-25 14:22:49 +02:00
Trilbyspaceclone
89bb18fe98 Update belt.dm 2020-04-25 00:50:03 -04:00
Ghom
21619b1ee3 Merge pull request #11925 from Trilbyspaceclone/patch-347 
The Pr that nerfs crayon eating
 2020-04-25 02:54:40 +02:00
Ghommie
0c1c879fb4 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit697 2020-04-25 02:49:59 +02:00
Ghom
5ccdc55e42 Merge pull request #11979 from kevinz000/magnetic_harness 
Cybernetic arm implant balance pass (namely: shields)
 2020-04-25 02:47:28 +02:00
Putnam
17f6099013 new clamp 2020-04-24 16:18:34 -07:00
Putnam
95d1a25df7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into fix-story-storyteller 2020-04-24 16:07:38 -07:00
Detective Google
71be8ed2fc ports all the tg junk for icemoon, not yet changed to make it all compile 2020-04-24 00:02:03 -05:00
Ghommie
e0a51903a1 Not yet implemented design security level requirements. 2020-04-24 00:51:04 +02:00
Ghommie
de531bd047 porting CEV-Eris pickweight procs. 2020-04-23 21:47:54 +02:00
kevinz000
cf61795101 Merge pull request #11941 from kiwedespars/punch-bundle 
re-adds north star gloves to traitors for 20 tc
 2020-04-23 11:45:04 -07:00
Trilbyspaceclone
8bcdbf5fc6 Update weaponry.dm 2020-04-23 03:29:26 -04:00
TrilbySpaceClone
c8b3032087 Merge branch 'master' into cube-world 2020-04-23 02:04:56 -04:00
kevinz000
1236e11eca Merge pull request #11950 from Citadel-Station-13/Ghommie-patch-3 
Fixing a little mistake with a config.
 2020-04-22 18:41:21 -07:00
kevinz000
411622430f Merge pull request #11985 from Ghommie/Ghommie-cit701 
Removal of backward 512 compatibility.
 2020-04-22 18:40:41 -07:00
Hatterhat
371e54e2e4 funny meme text 2020-04-22 18:06:30 -05:00
Ghommie
42201343a9 Backward 512 compatibility removal. 2020-04-23 00:59:23 +02:00
Hatterhat
c686ed193b a book about mashing Z and LMB 2020-04-22 17:55:11 -05:00
Trilbyspaceclone
511465ed7b Update shields.dm 2020-04-22 18:13:09 -04:00
Trilbyspaceclone
6a99c3b2c0 oops all the ) 2020-04-22 18:07:13 -04:00
Trilbyspaceclone
3418fe1541 Update weaponry.dm 2020-04-22 17:32:35 -04:00