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

365 Commits

Author SHA1 Message Date
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
The0bserver
55eb445a07 Adds Derringers (Code) Initial Commit 2021-04-11 04:20:12 -04: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
TrilbySpaceClone
3ae10ac826 update? 2020-08-06 13:09:41 -04:00
Trilbyspaceclone
e1e6198140 Merge branch 'master' into spike-loot-differentces 2020-08-03 10:53:08 -04:00
Trilbyspaceclone
ccca78a1ca Update spellcard.dm 2020-07-28 00:34:32 -04:00
Trilbyspaceclone
3a6d72af54 Update spellcard.dm 2020-07-28 00:20:14 -04:00
Trilbyspaceclone
c8fff28395 Update spellcard.dm 2020-07-28 00:12:00 -04:00
timothyteakettle
3ca098fe98 bugfixes 2020-07-25 00:22:24 +01:00
timothyteakettle
8360bb1a7f section 2 2020-07-24 23:44:57 +01:00
Timothy Teakettle
7fb55a02a5 section one 2020-07-24 22:34:22 +01:00
Timothy Teakettle
974b80a2fd Merge branch 'master' into wound-port 2020-07-18 21:45:24 +01:00
timothyteakettle
e8fade4f7f changes 2020-07-18 02:29:12 +01:00
timothyteakettle
7714fcfaba more changes 2020-07-18 01:26:38 +01:00
timothyteakettle
03bd806c73 pickle 2020-07-16 02:51:07 +01:00
Trilbyspaceclone
023dcc0019 Update spellcard.dm 2020-07-07 14:22:41 -04:00
Trilbyspaceclone
c21011c64c Update spellcard.dm 2020-07-07 14:09:31 -04:00
Trilbyspaceclone
f7dbce0cd0 Update spellcard.dm 2020-07-07 13:55:02 -04:00
Trilbyspaceclone
49b0d38112 Apply suggestions from code review 
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-07-07 13:47:56 -04:00
YakumoChen
67b5efbce0 Update pistol.dm 2020-07-01 09:03:48 +00:00
YakumoChen
346007b4fb Update beams.dm 2020-07-01 08:58:27 +00:00
kevinz000
445d94f335 haha whew 2020-06-17 21:32:10 -07:00
kevinz000
118ac1a775 Merge pull request #12548 from timothyteakettle/more-events 
ports several tg events including fugitives
 2020-06-17 20:10:04 -07:00