Commit Graph

17740 Commits

Author SHA1 Message Date
silicons
343ef7db2c fixes 2021-01-13 14:23:35 -07:00
silicons
2525334bb0 smooth movement twaeks 2021-01-09 15:30:56 -08:00
silicons
9733305997 Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-09 14:56:32 -08:00
silicons
e680d58a03 fixes 2021-01-09 14:56:29 -08: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
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
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
silicons
bffc43e95e fixes 2021-01-08 18:59:26 -08:00
silicons
849e9405fd projectile fix 2021-01-08 18:53:49 -08:00
silicons
bd9c979b07 riding datums 2021-01-08 18:48:59 -08:00
DeltaFire
9cfd3c073e smol fix 2021-01-09 00:33:20 +01:00
DeltaFire
56a2892fd3 sigh 2021-01-08 23:48:32 +01:00
silicons
bd3761d39e proper smooth movement 2021-01-08 10:51:48 -08:00
silicons
ddad368d6a Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-08 00:33:57 -08: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
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
silicons
6c9c3cc2d8 Merge pull request #13968 from Arturlang/pray_sounds
Ding for prayers
2021-01-05 23:39:37 -07:00
timothyteakettle
a375448a54 fixes 2021-01-05 23:18:52 +00:00
Timothy Teakettle
535dede85b i teleported bread 2021-01-05 22:20:41 +00:00
Lin
f724554059 Merge pull request #13964 from Citadel-Station-13/silicons-patch-2
fixes parrying working while otherwise paralyzed
2021-01-05 16:48:20 +00:00
silicons
cfc560ed3d Merge pull request #13856 from Putnam3145/harness-tweak-2
Actually made gear harness properly adjustable
2021-01-05 02:52:41 -07:00
Xantholne
18a336cec5 Adds bed tucking element 2021-01-05 02:47:21 -07:00
Artur
9e16df56aa Ding for prayers 2021-01-04 23:23:55 +02:00
keronshb
af3c8edf01 Small blob tweaks + fix
Fixes the permanent consumption of a factory blob w/ blobbernaut failure.  Also changes resource blob pointgen from 1 to 2 and allows factory blobs to be placed across 5 tiles instead of 7.
2021-01-04 12:32:41 -05:00
Xantholne
fe4f184792 good night disky 2021-01-04 03:50:43 -07:00
silicons
c937021b68 Update living_active_parry.dm 2021-01-04 03:17:51 -07:00
silicons
3897463f0b Merge pull request #13955 from Chiirno/NightmareLightsout
Nightmare Lights Damage Buff
2021-01-03 18:15:00 -07:00
silicons
7357ae3bc0 Merge pull request #13951 from BlueWildrose/CompensatingForSomething
Max groin cannon size increased before being punished for erecting a massive mayo-blaster to -max roundstart config- inches instead of 20
2021-01-03 18:13:50 -07:00
silicons
8dfbf3eb87 Merge pull request #13947 from Chiirno/ChemmasterOutputFix
Chemmaster output buff
2021-01-03 18:12:57 -07:00