shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
40,532 Commits 5 Branches 0 Tags
1811aeaebafa868f87ac407ca154ac014a2df367
Commit Graph

26539 Commits

Author SHA1 Message Date
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
Blue Wildrose
059d35921a quit making me drop my catgirl 2021-01-12 13:41:23 -07: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
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
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
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
timothyteakettle
99b26c08be Update sin_ruins.dm 2021-01-10 01:56:18 +00:00
silicons
fd77be9b89 Update _status_effects.dm 2021-01-09 16:44:56 -07:00
silicons
656691912e Merge pull request #13965 from Xantholne/GoodNightDisky 
Good Night Disky
 2021-01-09 15:39:06 -07:00
silicons
fffafff5d3 Merge pull request #13995 from DeltaFire15/xeno-clickdelay 
(Somewhat) fixes clickdelay when attacking objects.
 2021-01-09 15:38:07 -07:00
silicons
22a32d25b4 Merge pull request #14006 from DeltaFire15/borg-shell-dupe 
Attempting to complete a borg AI shell without a cell installed no longer causes issues
 2021-01-09 15:37:45 -07:00
silicons
3db556b9b7 Merge pull request #14007 from DeltaFire15/heretic-spec-role-fix 
Fixes heretic special role adding / removal
 2021-01-09 15:37:35 -07:00
silicons
2bf5a0e91e Merge pull request #14008 from TheSpaghetti/patch-5 
Removes double punctuation in the tumor bread description.
 2021-01-09 15:37:19 -07:00
silicons
778be450f1 Merge pull request #14010 from shellspeed1/fixes-missing-organs-in-tech-fab 
Fixes some missing upgraded cybernetic organs in the exofab and also makes prosthetic limbs printable at them.
 2021-01-09 15:36:28 -07:00
silicons
c36151b4cf Update machine_designs_sci.dm 2021-01-09 15:35:26 -07:00
DeltaFire
bc29b80c94 :lazy: 2021-01-09 22:46:40 +01:00
Timothy Teakettle
d459f6db91 Update looc.dm 2021-01-09 21:30:18 +00:00
DeltaFire
648c9f951b bonk 2021-01-09 22:30:09 +01:00
DeltaFire
125ea9dad2 vitality sigil drain 2021-01-09 20:44:51 +01: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
Lin
5e08df700f Merge pull request #13939 from silicons/reagentlogs 
low level reagent logging additions
 2021-01-09 16:24:40 +00:00
Lin
eb300481c4 Merge pull request #14002 from Citadel-Station-13/silicons-patch-5 
removes glitter persistence
 2021-01-09 16:12:33 +00:00
silicons
b0a94a6e1c Update engineering_nodes.dm 2021-01-09 07:30:14 -07:00
silicons
34c5d99afb Update machine_designs_sci.dm 2021-01-09 07:29:31 -07:00
silicons
9fec00621e Update colormate.dm 2021-01-09 06:43:55 -07:00
shellspeed1
04d60c85d9 a 2021-01-09 03:06:48 -08:00
TheSpaghetti
b52e8bf447 double punctuation bad 
no
 2021-01-09 00:18:15 -05:00
DeltaFire
9cfd3c073e smol fix 2021-01-09 00:33:20 +01:00
DeltaFire
23c5f1744d actually 2021-01-09 00:12:10 +01:00
DeltaFire
4f3df626c6 no cell no problem 2021-01-09 00:09:17 +01:00
DeltaFire
56a2892fd3 sigh 2021-01-08 23:48:32 +01:00
silicons
1022837827 Update misc.dm 2021-01-08 01:29:20 -07:00
Putnam3145
5cde6e0157 Merge pull request #13871 from silicons/debris 
Merry Christmas - GIVING JANITORS A JOB
 2021-01-08 00:26:52 -08:00