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
40,582 Commits 55 Branches 0 Tags
b91df1403e5bf93009335390147eea7fa1a8d300
Commit Graph

26574 Commits

Author SHA1 Message Date
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
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
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
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
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
DeltaFire
8b2044b407 another 2021-01-13 23:42:20 +01:00
DeltaFire
1a521b846f thanks 2021-01-13 23:39:36 +01:00
Lin
04c5d34cb6 Merge pull request #14015 from DeltaFire15/synth-stuffs 
Tweaks some Synth damage stuff
 2021-01-13 18:40:03 +00:00
DeltaFire
a9b420f68f Merge pull request #14038 from Hatterhat/atomization-never-heard-of-her 
an unatomic PR designed for maximizing maintainer suffering
 2021-01-13 18:28:59 +01:00
DeltaFire
7b02928558 Merge pull request #14036 from BlueWildrose/YouMadeMeDropMyCatgirl 
You will no longer unbuckle fireman-carried/piggybacked people when touching someone on help or grab intent
 2021-01-13 18:26:22 +01:00
DeltaFire
16c8ff1e52 Merge pull request #14027 from MrJWhit/stops-code-from-seeping-into-ic-chat 
Port: "stops code from seeping into ic chat"
 2021-01-13 18:21:30 +01:00
DeltaFire
84a95e5ddd Merge pull request #13994 from Citadel-Station-13/clowncar-safety 
hugboxes admin twitchplays clown car to not explode on death to avoid killing people (by default)
 2021-01-13 17:56:00 +01:00
DeltaFire
68557c84ae Merge pull request #14019 from timothyteakettle/stop-abusing-envys-knife 
species with NOTRANSSTING cannot have envy's knife used on them
 2021-01-13 17:54:57 +01:00
Hatterhat
2042de0f19 sterilegauze buff 2021-01-12 16:13:08 -06:00
Hatterhat
cb40ad4764 atomization is cowardice actually 2021-01-12 16:08:17 -06:00
SiliconMain
2d3e24fee4 Update engineering.dm 2021-01-12 14:43:54 -06:00
SiliconMain
bc64cedc2d Update misc_nodes.dm 2021-01-12 14:42:35 -06:00
Blue Wildrose
059d35921a quit making me drop my catgirl 2021-01-12 13:41:23 -07:00
SiliconMain
a26590965e Update misc_designs.dm 2021-01-12 14:41:10 -06:00
DeltaFire
c9e735b6b4 edge cases 2021-01-12 21:18:33 +01:00
kappa-sama
656d95ce2f i rewrote this at 2 in the morning 2021-01-12 09:57:36 -05:00
kappa-sama
f98edf0eaa shush 2021-01-12 09:55:18 -05:00
kappa-sama
a58141898c i was tired 2021-01-12 09:45:13 -05:00
kappa-sama
3d9e907532 fixed 2021-01-12 02:19:13 -05:00
kappa-sama
c751f114aa finally 2021-01-12 01:42:55 -05:00
BlueWildrose
19078449fe Merge branch 'master' into SkidoodleSkidaddle 2021-01-11 20:26:21 -07:00
DeltaFire
63aaac873f Merge pull request #13973 from Citadel-Station-13/shitcode 
completely removes penis/breast enlargement effects due to it being completely unmaintained and to be frank awful
 2021-01-12 01:30:24 +01:00
Lin
9d4b30d4e9 Merge pull request #14023 from Citadel-Station-13/silicons-patch-8 
the disk now snores every minute instead of every 2 seconds
 2021-01-12 00:01:44 +00:00
DeltaFire
4eab9e6520 why not 2021-01-11 18:06:43 +01:00
MrJWhit
893199679d Update arcade.dm 2021-01-11 08:46:12 -05:00
Blue Wildrose
b4fbeddda9 Probably makes more sense 2021-01-11 00:12:13 -07:00
Blue Wildrose
4ec834c3dd your dick is no longer a big fat noodle 2021-01-11 00:00:48 -07:00
DeltaFire
8590d364e0 spellcheck 2021-01-11 02:18:58 +01:00
DeltaFire
2b1d79dae0 synth medstuff 2021-01-11 02:11:30 +01:00
Lin
95101ac36a Merge pull request #14013 from Citadel-Station-13/compressor 
lets science actually print explosive compressors
 2021-01-11 00:21:11 +00:00
Timothy Teakettle
08d2b0bc17 Update code/modules/ruins/objects_and_mobs/sin_ruins.dm 
Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
 2021-01-10 23:41:52 +00:00
Lin
f4c4e0721b Merge pull request #14012 from Citadel-Station-13/silicons-patch-6 
fixes colormate last_matrix saving (again)
 2021-01-10 19:36:47 +00:00
silicons
cd62c45902 Update nuclearbomb.dm 2021-01-10 03:52:16 -07: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
Putnam3145
07399d2c93 Merge pull request #13949 from Citadel-Station-13/silicons-patch-60 
clamps cyborg sprint to 10 tiles/second and fixes them going methspeed
 2021-01-09 22:16:14 -08:00