Commit Graph

26867 Commits

Author SHA1 Message Date
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
shellspeed1 773a04e5ea Ports wings 2021-01-09 01:56:56 -08:00
necromanceranne 9c0989d233 Merge remote-tracking branch 'upstream/master' into robocoat 2021-01-09 19:02:38 +11: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 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 01321cb2ac let's just use the tg version 2021-01-08 12:06:15 -08:00
zerothebigboy 880b988813 Merge branch 'paramed' of https://github.com/zeroisthebiggay/Citadel-Station-13 into paramed 2021-01-08 14:33:14 -05:00
silicons bd3761d39e proper smooth movement 2021-01-08 10:51:48 -08:00
silicons 5934d9b591 uh 2021-01-08 03:08:38 -08:00
silicons 03a0900afe debug time 2021-01-08 03:03:14 -08:00
silicons 10c67a8bf9 update rust? 2021-01-08 02:55:29 -08:00
silicons 2870f5c7f1 uh 2021-01-08 01:46:09 -08:00
silicons 3795753ec0 uh 2021-01-08 01:10:17 -08:00
silicons ddad368d6a Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-08 00:33:57 -08: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
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
silicons 407b1fe071 Update humans.dm 2021-01-07 23:14:59 -07:00
MrJWhit cc2bcfedf1 Update garbage.dm 2021-01-07 22:50:03 -05: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
DeltaFire 108eace16e fix 2021-01-08 02:37:39 +01: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 f06a7c1ec3 Merge pull request #13980 from MrJWhit/first-things-first
Makes gas sensors fireproof
2021-01-07 17:22:41 -07: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