Commit Graph
17779 Commits
Author SHA1 Message Date
siliconsandGitHub 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
siliconsandGitHub 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
LinandGitHub 5e08df700f Merge pull request #13939 from silicons/reagentlogs
low level reagent logging additions
2021-01-09 16:24:40 +00:00
siliconsandGitHub b0a94a6e1c Update engineering_nodes.dm 2021-01-09 07:30:14 -07:00
siliconsandGitHub 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
shellspeed1 773a04e5ea Ports wings 2021-01-09 01:56:56 -08:00
TheSpaghettiandGitHub 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
zerothebigboy 880b988813 Merge branch 'paramed' of https://github.com/zeroisthebiggay/Citadel-Station-13 into paramed 2021-01-08 14:33:14 -05:00
Putnam3145andGitHub 5cde6e0157 Merge pull request #13871 from silicons/debris
Merry Christmas - GIVING JANITORS A JOB
2021-01-08 00:26:52 -08:00
siliconsandGitHub dc02c8cf74 Merge pull request #13967 from keronshb/blobtweaks
Small blob tweaks + fix
2021-01-08 01:20:23 -07:00
siliconsandGitHub 0d781aa71e Update chem_dispenser.dm 2021-01-08 01:17:56 -07:00
siliconsandGitHub 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
siliconsandGitHub 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
DeltaFireandGitHub 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
LinandGitHub b7cf425dff Merge pull request #13988 from DeltaFire15/who-reads-these-anyways
[s] we love private orders
2021-01-08 01:08:31 +00:00
shellspeed1andGitHub a25af6ea0c Update uplink_roles.dm 2021-01-07 16:53:09 -08:00
siliconsandGitHub 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
siliconsandGitHub 4e096d2a9f Update clowncar.dm 2021-01-07 17:11:03 -07:00
siliconsandGitHub 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
DeltaFireandGitHub 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
DeltaFireandGitHub 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
DeltaFireandGitHub 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
siliconsandGitHub 6c9c3cc2d8 Merge pull request #13968 from Arturlang/pray_sounds
Ding for prayers
2021-01-05 23:39:37 -07:00
siliconsandGitHub 2ad58a7a9d Update mobs.dm 2021-01-05 17:47:05 -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
zeroisthebiggayandGitHub 55d40f6b2d oh yeah fuck descriptions 2021-01-05 16:32:38 -05:00
LinandGitHub 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
siliconsandGitHub 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
siliconsandGitHub b3af424687 Update penis.dm 2021-01-05 02:46:30 -07:00
siliconsandGitHub 21bbbe6f2f Update breasts.dm 2021-01-05 02:46:00 -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