shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
40,511 Commits 5 Branches 0 Tags
16c8ff1e5225c1793384eaa3becb157fd16ec921
Commit Graph

17741 Commits

Author SHA1 Message Date
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
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
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
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
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
Timothy Teakettle
d459f6db91 Update looc.dm 2021-01-09 21:30:18 +00:00
Lin
5e08df700f Merge pull request #13939 from silicons/reagentlogs 
low level reagent logging additions
 2021-01-09 16:24:40 +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
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
56a2892fd3 sigh 2021-01-08 23:48:32 +01:00
Putnam3145
5cde6e0157 Merge pull request #13871 from silicons/debris 
Merry Christmas - GIVING JANITORS A JOB
 2021-01-08 00:26:52 -08:00
silicons
dc02c8cf74 Merge pull request #13967 from keronshb/blobtweaks 
Small blob tweaks + fix
 2021-01-08 01:20:23 -07:00
silicons
0d781aa71e Update chem_dispenser.dm 2021-01-08 01:17:56 -07:00
silicons
2c8326df35 Merge pull request #13976 from timothyteakettle/bread 
i have done nothing but teleport bread for three days
 2021-01-08 01:14:54 -07:00
silicons
4143564a67 Merge pull request #13996 from MrJWhit/morph-becoming-an-ai-fix 
Port of: Prevents the morph from become an AI eye
 2021-01-08 01:12:30 -07:00
DeltaFire
d153d82441 Merge pull request #13931 from shellspeed1/porting-turret 
Ports disposable sentry gun for station engineers as a traitor item from TG
 2021-01-08 02:59:48 +01:00
MrJWhit
784fca8bd4 Hehe fixies 2021-01-07 20:59:37 -05:00
Lin
b7cf425dff Merge pull request #13988 from DeltaFire15/who-reads-these-anyways 
[s] we love private orders
 2021-01-08 01:08:31 +00:00
shellspeed1
a25af6ea0c Update uplink_roles.dm 2021-01-07 16:53:09 -08:00
silicons
21101e62dd Merge pull request #13983 from shellspeed1/xenohybrid-stuff 
Adds some flavor stuff for the xenohybrid species tongue as well as wings. No longer includes language.
 2021-01-07 17:22:28 -07:00
silicons
4e096d2a9f Update clowncar.dm 2021-01-07 17:11:03 -07:00
silicons
acd6a5d8e5 Update sealed.dm 2021-01-07 17:10:26 -07:00
Artur
f5dc7d5c01 Makes cursed heart more tolerable 2021-01-07 22:27:13 +02:00
DeltaFire
d100fe1d58 Merge pull request #13981 from MrJWhit/caution-sign 
Porting the ability to wear the caution sign (plus a random metastation fix)
 2021-01-07 20:17:03 +01:00
Timothy Teakettle
44667ae1b6 edits 2021-01-07 16:46:42 +00:00
DeltaFire
e37790a997 fix 2021-01-07 00:23:18 +01:00
shellspeed1
0144a06964 Removes language to be done later 2021-01-06 11:59:37 -08:00
DeltaFire
3f736aaa36 Merge pull request #13834 from zeroisthebiggay/pogbox 
ports the traitor assistant POGBOX that scales damage with tc from /TG/
 2021-01-06 19:29:17 +01:00
DeltaFire
8b876aa6e3 Merge pull request #13957 from Citadel-Station-13/silicons-patch-1 
[s] logging patch 36735734
 2021-01-06 19:23:09 +01:00
shellspeed1
98f8af853c Minor xenohybrid changeschanges 
Adds wings, xeno tongue, and makes xenomorphs speak xenohybrid by default
 2021-01-06 01:58:58 -08:00
MrJWhit
abffac67b2 Port'n 2021-01-06 03:16:08 -05:00