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-11 10:22:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
43,326 Commits 55 Branches 0 Tags
1a90c96e4b82b56a3b3917f19bcb514580f49b04
Commit Graph

725 Commits

Author SHA1 Message Date
silicons
a7781f77fd Merge pull request #14802 from bunny232/atmosfoam 
Atmos resin buff? fix?
 2021-06-09 11:15:56 -07:00
silicons
716c2a04e4 Merge pull request #14160 from keronshb/motivation 
Adds a new traitor item, Motivation (Part 1)
 2021-06-09 11:10:17 -07:00
bunny232
7826ced174 Update effects_foam.dm 2021-06-06 12:54:07 -04:00
silicons
5601badbff deterministic explosion system (#13392) 
* wae explosions

* okay

* changes

* fixes

* fix

* ok

* ok

* kills more dead code

* okay

* fix

* ok

* tiles

* ok

* okay

* woops

* ok

* fix

* okay

* mob damage

* fixes

* insanity

* more

* more

* fixes

* more

* woot

* don't commit that

* YES

* fix
 2021-05-12 05:44:53 -05:00
silicons
97dcfd0750 Update effects_foam.dm 2021-05-06 02:02:25 -07:00
silicons
6ac964b35a e 2021-05-06 01:52:35 -07:00
keronshb
20c190c17d Merge remote-tracking branch 'upstream/master' into motivation 2021-04-14 17:55:24 -04:00
kiwedespars
5ce42584b2 void tp effect, sound changes 2021-03-10 21:16:08 -08:00
kiwedespars
3ce6459aef void heretic and many other prs 2021-03-09 02:58:34 -08:00
SandPoot
123de14009 upload files 2021-02-18 15:05:39 -03:00
SandPoot
f738023097 Revert "Merge branch 'tool_behavior-replacing' of https://github.com/SandPoot/Citadel-Station-13 into tool_behavior-replacing" 
This reverts commit 2e29f30fdf, reversing
changes made to 724910cfab.
 2021-02-18 15:04:46 -03:00
SandPoot
cf2e70671a upload files 2021-02-18 14:47:10 -03:00
keronshb
41530110a2 LINTER 
AHHHH NEW LINE
 2021-02-10 20:00:17 -05:00
Timothy Teakettle
5ebdb6deec yes 2021-02-09 09:37:17 +00:00
keronshb
a4e933185e Merge remote-tracking branch 'origin/master' into motivation 2021-01-29 09:29:55 -05:00
keronshb
a6725b3c23 Motivation near final 
Should be almost done after this.
 2021-01-28 22:06:25 -05:00
Letter N
02ca168df3 why are we building windows facing nothing but rock infront of it? 2021-01-20 11:37:44 +08:00
silicons
dedb0cb62e Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-19 04:24:42 -07:00
The0bserver
1b469bdfda The power of overwriting... 2021-01-14 01:03:48 -05:00
silicons
9733305997 Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-09 14:56:32 -08:00
silicons
ddad368d6a Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-08 00:33:57 -08:00
silicons
1022837827 Update misc.dm 2021-01-08 01:29:20 -07:00
silicons
407b1fe071 Update humans.dm 2021-01-07 23:14:59 -07:00
silicons
78322199e3 fix 2021-01-01 00:38:46 -08:00
silicons
34256a61ef remove drips 2020-12-30 21:06:34 -08:00
silicons
e6000ceffa meme 2020-12-29 11:12:06 -08:00
silicons
57d85f7e86 okay 2020-12-27 05:20:29 -08:00
silicons
a42fa987ba ok 2020-12-26 22:43:25 -08:00
silicons
5266ae1437 okay 2020-12-26 22:28:41 -08:00
silicons
bfb3d087c3 ok 2020-12-26 20:50:28 -08:00
silicons
d3414a4d23 ok 2020-12-26 20:47:50 -08:00
silicons
dafc6bf89f fix 2020-12-26 20:41:21 -08:00
silicons
3228435237 errors 2020-12-26 20:33:16 -08:00
silicons
6044086de0 changes 2020-12-26 20:29:52 -08:00
silicons
b7cd14b41e poggy? 2020-12-26 20:09:24 -08:00
silicons
9f130e0c5a blood 2020-12-26 14:09:10 -08:00
silicons
5c0b4f824f hoh boy 2020-12-26 12:42:03 -08:00
silicons
45af2360ad changes 2020-12-26 11:35:47 -08:00
silicons
5cf717e75d self message 2020-12-25 16:10:32 -08:00
silicons
5e66e4509f wew 2020-12-25 16:07:17 -08:00
Letter N
abd94d1c03 Merge remote-tracking branch 'origin/master' into semi-sync 2020-12-21 21:19:06 +08:00
Letter N
a808f805d4 ASYNC EVERYTHING! 2020-12-21 16:24:51 +08:00
MrJWhit
53d41ea190 Update mines.dm 2020-12-14 15:57:57 -05:00
Letter N
cf692e8426 subsystem upgrades 2020-12-14 15:28:59 +08:00
silicons
803bff4e5f funny 2020-11-12 23:34:42 -07:00
Ghommie
f49f72338f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit841 2020-10-25 15:01:57 +01:00
Ghommie
90c4cb2022 Here I fix a few issues. 2020-10-25 14:50:42 +01:00
Ghommie
c0f3317c01 mime/clown masks' face concealment altclick toggle. Plasmaman helmets' welding visors & smileys port. 2020-10-16 20:27:09 +02:00
Tupinambis
3224533a7c Merge branch 'master' into spooder 2020-10-11 14:31:23 -05:00
silicons
ad32b8f437 Merge pull request #13472 from timothyteakettle/slime-puddle 
the pr that lets slimes turn into useless puddles
 2020-10-10 11:14:25 -07:00