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-16 04:43:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
37,403 Commits 55 Branches 0 Tags
30471d41711d31e6671e765892a6dbd218f19d09
Commit Graph

921 Commits

Author SHA1 Message Date
lolman360
bd5848a0e3 Update recipes_misc.dm 2020-08-24 08:52:42 +10:00
lolman360
289280f0ec Update recipes_misc.dm 2020-08-24 00:00:39 +10:00
lolman360
bc14155632 Merge remote-tracking branch 'upstream/master' into AnPrimAssistants 2020-08-23 17:01:45 +10:00
lolman360
1deafc7103 its asking me to commit hold on 2020-08-23 17:01:32 +10:00
lolman360
2a3ada511e It's all codersprites? 
Always has been.
 2020-08-23 16:51:55 +10:00
silicons
c7c74e7c51 Merge pull request #13213 from lolman360/breath 
breath mask balaclava
 2020-08-22 15:22:04 -07:00
silicons
876dc36dbc Merge pull request #13201 from kiwedespars/return-the-punch 
makes it so you can craft armwraps roundstart again.
 2020-08-22 15:21:22 -07:00
silicons
7737e76b32 Merge pull request #13224 from Ghommie/Ghommie-cit835 
Removing priority overlays, update_icon() splitup for guns.
 2020-08-22 15:19:07 -07:00
kiwedespars
055d397e1e adds tape 2020-08-21 13:34:02 -07:00
silicons
120bcfc00c Merge pull request #13178 from lolman360/plumb 
[READY] ports plumbing (no more waiting for tgui4)
 2020-08-20 21:32:26 -07:00
lolman360
623fe1cb69 Update recipes_clothing.dm 2020-08-21 12:00:09 +10:00
lolman360
bda2c740ba Merge branch 'master' into AnPrimAssistants 2020-08-21 11:08:13 +10:00
Ghommie
fde859bca0 Removing priority overlays, update_icon() splitup for guns. 2020-08-20 18:33:23 +02:00
lolman360
4259332cfd e 2020-08-19 18:37:31 +10:00
lolman360
7390effcb9 e 2020-08-18 19:09:01 +10:00
lolman360
b466a5aae9 e 2020-08-18 18:57:23 +10:00
lolman360
9931cb006c eee 2020-08-18 17:33:20 +10:00
kiwedespars
bd239b01b3 Update recipes_clothing.dm 2020-08-17 23:52:41 -07:00
lolman360
bb86003510 w e w 2020-08-18 10:04:52 +10:00
silicons
8dedcbcf76 Merge branch '13113' 2020-08-16 18:53:35 -07:00
silicons
2095e2705f Merge branch '13169' 2020-08-16 18:52:13 -07:00
lolman360
09fc795f3b AnPrim 2020-08-17 11:45:24 +10:00
Lin
d287f44d9a Merge pull request #13045 from silicons/coggers 
ports bronze (fake clockwork) airlocks and windows
 2020-08-16 20:20:03 -05:00
kiwedespars
7c653d0891 i actually kinda like the idea that you need a point for paths. 
- whoops actually increases stamdamage of mansus grasp to 60.
- ascensions bumped up to 5 each.
- recipe for a codex made a bit harder.
 2020-08-16 04:34:04 -07:00
Letter N
15a1ffde52 fix 2020-08-15 09:46:50 +08:00
kiwedespars
aa46e355da more more more. 
- sacrifices give 2 charges now.
- books no longer contain a charge by default. (sorry gamerko, no easy ascensions while i sleep.)
- books are easier to craft.
 2020-08-14 05:19:57 -07:00
lolman360
6f7badda41 Merge branch 'master' into plumb 2020-08-12 09:03:11 +10:00
lolman360
740b4f3ecf WHOOPS 2020-08-11 17:50:30 +10:00
lolman360
6ec9a3c4bd craftable plunger 2020-08-11 17:38:16 +10:00
chrisbbbbbbb
758d540c9e Suture/Mesh Crafting 2020-08-09 20:33:40 +02:00
lolman360
308d77da7c Merge branch 'master' into plumb 2020-08-09 22:48:18 +10:00
silicons
f20f01cc6b Merge pull request #12853 from LetterN/TGUI-4 
TGUI4 port
 2020-08-09 05:46:21 -07:00
silicons
d25daec117 Merge pull request #13081 from Putnam3145/ethereals 
Ports ethereals from TG
 2020-08-09 05:39:43 -07:00
silicons
3acd4ac6de Merge pull request #13069 from Chiirno/radioactive-port 
Ports TG #51879 - Makes rads glow, buffs rad goggles
 2020-08-09 05:35:08 -07:00
Letter N
f1c4a7f6ac Merge remote-tracking branch 'origin/master' into TGUI-4 2020-08-09 14:54:16 +08:00
Lin
dea2dab536 Merge pull request #13055 from Citadel-Station-13/silicons-patch-78 
squeaking objects including air horns and clockwork boots now have a default 1 second cooldown. squeaking objects crossing each other will on average only allow 3 squeaks to occur, because if byond is literally running out of sound channels you know the fun has went too far
 2020-08-08 12:06:42 -05:00
Putnam
9bb3ba5c5a added ethereals 2020-08-08 00:08:43 -07:00
Lynxless
14e35806b9 I hope this works 2020-08-07 16:23:15 -03:00
silicons
36bdb9e482 Update twohanded.dm 2020-08-07 01:31:29 -07:00
silicons
94fa7e4fbb Update squeak.dm 2020-08-07 01:06:23 -07:00
silicons
95607274e3 Update twohanded.dm 2020-08-07 00:19:02 -07:00
silicons
b80fe7013e Update twohanded.dm 2020-08-07 00:17:12 -07:00
silicons
23880e284a Update squeak.dm 2020-08-06 21:48:01 -07:00
silicons
79313209c3 Update squeak.dm 2020-08-06 21:42:13 -07:00
silicons
29228a9df4 Update squeak.dm 2020-08-06 21:36:53 -07:00
Letter N
333ca2cc7b Merge remote-tracking branch 'origin/master' into TGUI-4 2020-08-06 18:26:04 +08:00
silicons
815ddd1866 oh boy 2020-08-05 21:34:26 -07:00
Letter N
454baea55f Merge remote-tracking branch 'origin/master' into TGUI-4 2020-08-04 09:31:34 +08:00
silicons
a4132c04ea Merge pull request #12894 from timothyteakettle/wounds-part-2 
port of wounds part 2
 2020-08-03 14:43:07 -07:00
Letter N
a19e306137 less redtext - updates anomalies 2020-08-03 20:53:36 +08:00