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 09:54:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
41,053 Commits 55 Branches 0 Tags
fb592b70a1556c99b5062c55220ee31c12c3844b
Commit Graph

3462 Commits

Author SHA1 Message Date
TyrianTyrell
fb592b70a1 Update negative.dm 2021-02-04 15:10:12 -05:00
TyrianTyrell
44366a4a2e Currently removing phobia picking 2021-02-04 15:04:17 -05:00
TyrianTyrell
678d0c950f Update negative.dm 2021-02-01 05:48:34 -05:00
TyrianTyrell
9bda74c58d Update good.dm 2021-02-01 05:34:45 -05:00
Lin
f7c1cdc571 Merge pull request #14112 from silicons/ex_act_3 
~~hugboxes~~ fixes the bug (that was probably my fault) that makes 1 dev explosions ALWAYS delete brain
 2021-01-27 17:16:44 -06:00
Putnam3145
2765aed0b4 Merge pull request #14085 from Citadel-Station-13/silicons-patch-24 
ok as funny as this is, painting pets in gear painters is the result of a potentially awful bug regarding mob holder drop logic
 2021-01-26 22:24:57 -08:00
silicons
6a2ae34ebe Merge pull request #14111 from Arturlang/revenant_TK 
[READY]Gives the revenant TK
 2021-01-25 23:17:09 -07:00
silicons
efecc1804b Merge pull request #14114 from Hatterhat/fgs 
itt: i dont test my code again - free golem ship GPSes start disabled
 2021-01-25 22:59:09 -07:00
raspy-on-osu
f2d9643c75 init 2021-01-24 22:31:39 -05:00
raspy-on-osu
622a3df378 Merge branch 'master' of https://github.com/raspy-on-osu/Citadel-Station-13 into ventcrawl-refactor 2021-01-24 19:21:24 -05:00
Hatterhat
95db018de8 itt: i dont test my code again 2021-01-20 18:34:57 -06:00
silicons
f6a8306174 Merge pull request #14109 from Arturlang/space_tackling_meme_fix 
Fixes the space tackling meme
 2021-01-20 15:17:36 -07:00
silicons
5afe3bbb6f Merge remote-tracking branch 'citadel/master' into ex_act_3 2021-01-20 15:15:10 -07:00
silicons
f6eca7afad hugboxy shit 2021-01-20 15:06:53 -07:00
Artur
66979e2364 Merge branch 'master' into revenant_TK 2021-01-20 18:27:11 +02:00
Artur
16e0b85b44 More funshit 2021-01-20 18:23:28 +02:00
Artur
5aa710ffd7 spess 2021-01-20 16:05:20 +02:00
Artur
ef950400a4 Fixes the space tackling meme 2021-01-20 15:50:41 +02:00
Letter N
021b28a2b7 cleanup 
shitcode - b - gone
 2021-01-20 11:08:21 +08:00
silicons
dedb0cb62e Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-19 04:24:42 -07:00
silicons
6146a4ca9a Update mob_holder.dm 2021-01-17 20:24:53 -07:00
silicons
b6cdde2f52 squeak fix 2021-01-16 06:12:34 -07:00
silicons
e96fec682e fix 2021-01-16 04:59:07 -07:00
The0bserver
b91df1403e The lack of recevier. It is the opposite of funny! 2021-01-14 01:31:58 -05:00
The0bserver
e01c57c832 Show me the opposite of funny! 2021-01-14 01:12:53 -05:00
The0bserver
1b469bdfda The power of overwriting... 2021-01-14 01:03:48 -05:00
The0bserver
d957c1d105 another tweak 2021-01-14 00:02:32 -05:00
silicons
8f7b483161 remove reverb 2021-01-13 21:37:30 -07:00
The0bserver
ffe401544c First wave of fixing 2021-01-13 23:35:37 -05:00
The0bserver
55cd69746d A change in tact, perhaps? 2021-01-13 23:08:05 -05:00
The0bserver
2b8b9086ec Revert "Initial Commit:Goodbye rifle! You won't be missed!" 
This reverts commit 1836d0106a.
 2021-01-13 22:14:36 -05:00
The0bserver
1836d0106a Initial Commit:Goodbye rifle! You won't be missed! 2021-01-13 21:42:08 -05:00
silicons
ce0891c2eb Merge pull request #14021 from DeltaFire15/emp-fuckeroni 
Fixes combat mode being permanently disabled under specific circumstances
 2021-01-13 16:57:42 -07:00
silicons
ae290cf5f0 newlines 2021-01-13 16:56:36 -07:00
silicons
c66874f732 Merge pull request #14032 from kappa-sama/kaiowhat 
two toggled self-buffing spells that have no relation to any anime or video game in particular
 2021-01-13 16:50:50 -07:00
silicons
ea07ad6e48 Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-13 15:41:28 -07:00
silicons
343ef7db2c fixes 2021-01-13 14:23:35 -07:00
silicons
3fe2776a6a fix 2021-01-13 13:44:46 -07:00
Lin
04c5d34cb6 Merge pull request #14015 from DeltaFire15/synth-stuffs 
Tweaks some Synth damage stuff
 2021-01-13 18:40:03 +00:00
Hatterhat
cb40ad4764 atomization is cowardice actually 2021-01-12 16:08:17 -06:00
kappa-sama
c751f114aa finally 2021-01-12 01:42:55 -05:00
silicons
72bc00bc22 Merge pull request #13993 from Arturlang/cursed_heart_tweaks 
Makes cursed heart more tolerable
 2021-01-10 01:36:43 -07:00
DeltaFire
3f6939c1cb fix 2021-01-10 06:20:27 +01:00
silicons
121104ca6c Merge pull request #14014 from necromanceranne/bokken_fixes_2 
Bokken Fixes 2: Missing sprites and stuff
 2021-01-09 19:49:10 -07:00
silicons
9733305997 Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-09 14:56:32 -08:00
silicons
e680d58a03 fixes 2021-01-09 14:56:29 -08:00
silicons
656691912e Merge pull request #13965 from Xantholne/GoodNightDisky 
Good Night Disky
 2021-01-09 15:39:06 -07:00
DeltaFire
05f7991981 snap 2021-01-09 20:37:24 +01:00
necromanceranne
6d10ca9efa Fixes missing sprites on the steelwood bokkens, fixes further problems with crafting bokken parts 2021-01-10 05:43:33 +11:00
silicons
bffc43e95e fixes 2021-01-08 18:59:26 -08:00