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
41,301 Commits 55 Branches 0 Tags
66570144b9b51c61202a1bdad39864c5c3540cd6
Commit Graph

18077 Commits

Author SHA1 Message Date
silicons
4099e57f4e Merge pull request #13963 from necromanceranne/robocoat 
Mostly ports tgstation #54644; New roboticist labcoat sprites
 2021-01-17 20:43:24 -07:00
silicons
2266a9e17b Merge pull request #14037 from DeltaFire15/nanogel 
Nanogel for robotic limbs
 2021-01-17 20:42:19 -07:00
silicons
0db94c5aa8 Update code/modules/reagents/chemistry/reagents/toxin_reagents.dm 
Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
 2021-01-17 20:41:48 -07:00
silicons
af524f4a07 Merge pull request #14029 from HeroWithYay/Sci_Guns_Fix 
Ports TG code for wormhole projector and gravity gun.
 2021-01-17 20:41:20 -07:00
silicons
e336d26a33 Merge pull request #14043 from timothyteakettle/pie-lick 
licking people washes pie off their face
 2021-01-17 20:40:47 -07:00
silicons
c0edfa729b Merge pull request #14070 from YakumoChen/distressingly-fuzzy 
Makes Buzz Fuzz go on a diet
 2021-01-17 20:40:22 -07:00
silicons
829e946755 Merge pull request #14061 from Hatterhat/gauze-parity 
something something gauze things
 2021-01-17 20:40:09 -07:00
silicons
444ba0ed0d Update pool_main.dm 2021-01-17 20:01:07 -07:00
shellspeed1
c89341227c Adds more dead xeno subtypes for mapping 2021-01-17 18:01:24 -08:00
kappa-sama
aa6687646d s 
s
 2021-01-17 19:50:44 -05:00
Fermi
cb614bcd95 Merge branch 'master' into Dispencer-UI-change 2021-01-17 22:19:45 +00:00
silicons
30b1cd82f9 . 2021-01-17 12:02:12 -07:00
silicons
a917034542 Update toggles.dm 2021-01-17 03:46:20 -07:00
silicons
45a2076771 Update toggles.dm 2021-01-17 03:35:49 -07:00
Letter N
7afe6d617f Update kinkmate.dm 2021-01-17 17:50:14 +08:00
Hatterhat
6e18f10ead forgot i wasnt usin that oops 2021-01-17 01:50:28 -06:00
Hatterhat
cb1ef2d8ba cotton stack pull 2021-01-17 01:42:32 -06:00
silicons
5f117a0331 Update basilisk.dm 2021-01-16 03:15:49 -07:00
YakumoChen
693887487b I saw what had been wrought, and trembled 2021-01-16 08:29:14 +00:00
YakumoChen
fba17abaf4 god damn it Trilby 2021-01-16 08:23:08 +00:00
necromanceranne
6ac010e442 Merge branch 'master' into robocoat 2021-01-16 04:56:03 +11:00
DeltaFire
aa1cae9f33 Merge pull request #14054 from TheObserver-sys/AReturnToForm 
Returns the Maintenance Shotgun to it's original recipe. Removes the Maintenance Rifle, and associated items.
 2021-01-15 18:22:05 +01:00
DeltaFire
771a4f3c41 Merge pull request #14060 from Hatterhat/shrink-removal 
removes shrink ray again because "wait, whose idea was to readd this?" (turns out it was shoehorned back in by lettern during the tgui port)
 2021-01-15 18:14:42 +01:00
silicons
68e9be9647 Merge pull request #14042 from kiwedespars/dildo-1 
adds klonk sound effect for literal horsecock dildo
 2021-01-15 04:00:08 -07:00
kappa-sama
1134e1ce20 i don't wanna talk about it 2021-01-15 00:36:45 -05:00
silicons
8e8d1571f0 sigh 2021-01-14 20:43:27 -07:00
Hatterhat
a468f400e3 see branch name 2021-01-14 20:55:06 -06:00
Hatterhat
798b25846d gauze parity 2021-01-14 20:53:55 -06:00
Hatterhat
5e6ace2668 bruh 2021-01-14 20:49:46 -06:00
silicons
608465f1ed Update toxin_reagents.dm 2021-01-14 17:14:09 -07:00
silicons
a9b3e6a514 Update carbon_defense.dm 2021-01-14 04:33:15 -07:00
Artur
19f27f2f59 Somehow forgot this very important detail 2021-01-14 10:57:46 +02:00
The0bserver
1b469bdfda The power of overwriting... 2021-01-14 01:03:48 -05:00
silicons
05fcd10506 Update carbon_defense.dm 2021-01-13 22:46:01 -07:00
silicons
1188431bcb Update carbon_defense.dm 2021-01-13 22:40:13 -07: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
silicons
28849dd8e9 Merge pull request #14039 from Hatterhat/sticky-start 
on the precipice of stickiness - sticky tape roundstart tech
 2021-01-13 21:02:23 -07: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
aa830b257a Merge pull request #13975 from zeroisthebiggay/paramed 
resprites paramedic softsuit to not violate r*d cr*ss copyright and resprites the paramedic closet
 2021-01-13 16:58:04 -07:00
silicons
ae290cf5f0 newlines 2021-01-13 16:56:36 -07:00
silicons
82cc5da8df Merge pull request #14034 from DeltaFire15/blindness-edgecase-fix 
Fixes some edge cases regarding system corruption
 2021-01-13 16:53:17 -07:00
silicons
bcb2e16cef Merge pull request #14035 from SiliconMain/baitbegone 
Comments out hololocks
 2021-01-13 16:53:01 -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
310a631ffa Merge pull request #14025 from DeltaFire15/synth-robotics-revival 
More Synth tweaks
 2021-01-13 16:48:05 -07:00
silicons
f7cadc3293 Merge pull request #14009 from shellspeed1/wing-stuff 
Ports a bunch of wings from cit RP and fulpstation [Ready]
 2021-01-13 16:47:34 -07:00
silicons
9ddb3dc5d9 fix 2021-01-13 16:22:43 -07:00
DeltaFire
8b2044b407 another 2021-01-13 23:42:20 +01:00