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
47,140 Commits 55 Branches 0 Tags
a0cbb5247916a74d8956567c2bf13d2dfd6bb603
Commit Graph

385 Commits

Author SHA1 Message Date
Hatterhat
2155a8bdce funny ammo 2022-08-03 06:11:04 -05:00
SandPoot
2555843026 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Initialize(mapload) 2022-04-09 03:06:56 -03:00
Lin
fd286c325e Merge branch 'master' into Projectile_Rework 2022-04-09 04:19:56 +00:00
SandPoot
695835fcd6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Initialize(mapload) 2022-04-09 00:03:13 -03:00
SandPoot
586a035132 Update files 2022-04-06 18:41:31 -03:00
SandPoot
189716314f Would you like some defines in these trying times? 2022-03-23 12:10:02 -03:00
SandPoot
a8f454bd72 Upload files 2022-03-16 14:00:31 -03:00
Solaris-Shade
171bd18c8a Updated Projectile code some more. 2022-03-11 22:23:01 -05:00
Solaris-Shade
c5be81c589 tg moved projectiles out of /item, added '/item' back 2022-03-06 16:29:58 -05:00
Solaris-Shade
2fdb70b2b9 [DNM][DNM][WIP] Projectile backend code port and update 
Ports#54924,  #65061, #59804 from /tg.
adds auxiliary code from /tg to make code work.
 2022-03-06 15:20:23 -05:00
Lin
efa02148d1 Merge pull request #15275 from keronshb/halloweenball2021 
Spookystation (Ball Map) and Vector Cars
 2021-11-17 16:26:07 +00:00
silicons
186b552103 merge 2021-10-29 21:50:58 -07:00
keronshb
3cfea7eb92 Ball2021 2021-10-16 00:02:05 -04:00
kiwedespars
f3550fd87c blacklists morphine from dart guns, also haloperidol (#15152) 
* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* yeag

* actually adds the blacklist

can't you feel my heart beat so, i can't let you go, want you in my life

* changes

* Update html/changelog.html

Co-authored-by: zeroisthebiggay <43571008+zeroisthebiggay@users.noreply.github.com>

Co-authored-by: Changelogs <action@github.com>
Co-authored-by: zeroisthebiggay <43571008+zeroisthebiggay@users.noreply.github.com>
 2021-09-17 12:54:02 +02:00
silicons
2192d8a87e Merge pull request #14817 from zeroisthebiggay/endit 
[READY] tempgun rebalance (it's not a nerf don't worry)
 2021-08-02 17:11:20 -07:00
silicons
a5a476f457 cyborg shovies 2021-06-28 13:10:40 -07:00
silicons
8595e05ad9 Merge remote-tracking branch 'citadel/master' into combat_v7 2021-06-13 15:37:35 -07:00
zerothebigboy
fa738856bf i need a nap 2021-06-10 03:22:34 -04:00
silicons
09d61c3bec Merge pull request #14776 from WanderingFox95/WanderingFox95-CatSurgeon 
New Challenger: The Cat Surgeon has appeared! (Ready!)
 2021-06-09 11:29:24 -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
WanderingFox95
7884ccf316 Only 5 units are necessary, so why keep it at 10? 
I mean, this is the refining process
 2021-06-05 14:51:59 +02:00
WanderingFox95
e69729beb4 So he doesn't need sodium thiopental after all. 
Turns out Furranium has a knockdown.
 2021-05-31 12:15:16 +02:00
WanderingFox95
ae2970f318 Adds a special Catranq Dart 2021-05-30 21:17:03 +02:00
silicons
275b532a8c Merge remote-tracking branch 'citadel/master' into combat_v7 2021-04-26 14:17:43 -07:00
The0bserver
55eb445a07 Adds Derringers (Code) Initial Commit 2021-04-11 04:20:12 -04:00
silicons
70b8d833c0 changes 2021-02-28 00:00:14 -07:00
keronshb
41530110a2 LINTER 
AHHHH NEW LINE
 2021-02-10 20:00:17 -05:00
keronshb
26dfff87fc Slight stat buffs, adds parries and comments 
Should be pretty close to 20tc worthy.
 2021-01-29 13:17:46 -05:00
keronshb
4346cb937a Fixes merge conflict and makes minor adjustments 
TItle
 2021-01-29 09:32:28 -05: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
keronshb
a2833ea85f Movitation WIP 
WIP still working on this
 2021-01-26 13:27:06 -05:00
silicons
a1e92e55aa Merge pull request #14102 from Hatterhat/somatobuff-50513 
[READY] somatoray buff - mutation locks + revolution ray
 2021-01-25 23:17:29 -07:00
Letter N
021b28a2b7 cleanup 
shitcode - b - gone
 2021-01-20 11:08:21 +08:00
Hatterhat
e006587f4b today i will not test my code 2021-01-19 17:24:33 -06:00
silicons
0229078b58 Update foam_dart.dm 2021-01-18 02:32:21 -07:00
silicons
879ea9c6c8 ok 2020-12-25 14:23:16 -08:00
DeltaFire
1e8e1ec72b Merge pull request #13786 from kiwedespars/why 
x-ray laser nerfs
 2020-12-19 05:28:43 +01:00
kiwedespars
9b710f5553 Update beams.dm 2020-12-18 15:53:11 -08:00
kiwedespars
a95ba25d17 Update beams.dm 
25 -> 75 rad
15 -> 20 damage
 2020-12-15 21:02:46 -08:00
kiwedespars
92c70b8089 Update beams.dm 2020-12-14 19:46:28 -08:00
silicons
5b03f5b0ec more 2020-11-12 23:36:18 -07:00
silicons
19f1e99a8c mass ports like 15 tg prs + counting (#13386) 
* changes

* ok

* changes

* sigh

* fixes

* changes

* fix

* fix

* alright

* fixes
git pus

* fix

* fix

* fix

* test

* ok

* Update code/modules/paperwork/ticketmachine.dm

Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>

* ok

* compile and other stuff

* ok

* fix

* fix

* Fix

* Update menu.dm

* Update view.dm

* Update preferences.dm

Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
 2020-10-10 12:20:33 +02:00
Timothy Teakettle
58737e42b9 empulse using range 2020-09-10 19:52:34 +01:00
timothyteakettle
e0f44ef717 new emps 2020-09-10 03:49:47 +01:00
Trilbyspaceclone
c4885d81f3 Merge branch 'master' into spike-loot-differentces 2020-08-27 03:41:14 -04:00
silicons
d35cba095f Merge pull request #13108 from Hatterhat/357-dumdum 
.357 DumDum Rounds (they're adminspawn only don't worry)
 2020-08-17 08:58:00 -07:00
Detective-Google
13f6df3991 nerfs plasma cutters 2020-08-14 19:38:14 -05:00
Hatterhat
eeefc1cbaa heho woundies 2020-08-11 16:01:29 -05:00
Hatterhat
8370a31942 funny adminspawn wound bullets 2020-08-10 12:12:32 -05:00