Commit Graph

22034 Commits

Author SHA1 Message Date
SteelSlayer
0bf9aa199e Merge remote-tracking branch 'upstream/master' into air-injector-link-fix 2020-09-07 11:32:12 -05:00
Kugamo
ac558c76ff fixem PAI die 2020-09-07 07:23:31 -05:00
AffectedArc07
333c018d28 Merge pull request #14247 from farie82/dead-talk-fixes
Makes dead chat logged in the file when you're in a body. Makes say_dead handle all the logic. Whispering while dead won't do anything now
2020-09-06 15:15:37 +01:00
joep van der velden
141093b9a3 Dead can't whisper. Dead say code consolidation 2020-09-06 15:45:22 +02:00
AffectedArc07
ac0a9b7ba7 Merge pull request #14145 from TDSSS/armory-shuttle
New admin shuttle template: Armory shuttle
2020-09-06 11:13:01 +01:00
AffectedArc07
48346d2ac5 Merge pull request #14180 from SabreML/AI-languages
Allows the AI to speak all (common) languages
2020-09-06 11:05:27 +01:00
AffectedArc07
ea38586ef1 Merge pull request #14218 from RedWolfie/experimentor
[Bugfix] E.X.P.E.R.I-MENTOR runtime fix
2020-09-06 10:57:11 +01:00
AffectedArc07
cefc361b42 Merge pull request #14243 from SteelSlayer/holopad-talk-fix
Fixes being able to hear holopad speech while asleep or deaf
2020-09-06 10:13:48 +01:00
AffectedArc07
db560898a2 Merge pull request #14208 from TDSSS/stethoscope
added stethoscope to the autholathe
2020-09-06 10:11:16 +01:00
SteelSlayer
67da136058 holopad talk fix 2020-09-05 22:47:55 -05:00
Kugamo
a352c15835 Fixes missing space between names 2020-09-04 19:59:28 -05:00
mochi
7866535ce3 Use key_name_admin() when alerting admins on craft 2020-09-04 22:16:37 +02:00
Certhic
4926876119 scrapped reagants 2020-09-04 10:48:32 +02:00
Certhic
e0c6612e30 reverted an accidental change 2020-09-03 16:23:08 +02:00
Certhic
147cd00729 tweaks to experimentor bugfix 2020-09-03 16:18:09 +02:00
Certhic
42edb7ba75 fixed runtime in experimentor 2020-09-02 14:31:54 +02:00
AffectedArc07
0ccf04ba23 Merge pull request #14056 from SabreML/Wood-Deconstruction
Makes more wooden structures deconstructable.
2020-09-02 11:05:33 +01:00
AffectedArc07
e9c5df4b9f Merge pull request #14188 from Cocacolagua/hardened-skin
Bone Reinforcement rename to Hardened Skin
2020-09-02 11:02:36 +01:00
AffectedArc07
299583b3e1 Merge pull request #14197 from farie82/mech-hand-attack-notice
Makes the attack_hand on mechs and borgs less annoying
2020-09-02 11:01:35 +01:00
AffectedArc07
35682a8e20 Merge pull request #14210 from RedWolfie/crayon
[Bugfix] Orange cables
2020-09-02 11:00:23 +01:00
AffectedArc07
ec595f9bbe Merge pull request #14214 from RedWolfie/glass
[Bugfix] Fixes shotglasses
2020-09-02 10:05:35 +01:00
Certhic
ca82d79d87 fixes shotglass burning 2020-09-02 10:04:23 +02:00
Certhic
90ac9874b2 fixed orange crayons not making cables orange 2020-09-01 16:23:53 +02:00
TDSSS
c65940dc2e added stethoscope autholathe design 2020-09-01 15:10:25 +02:00
AffectedArc07
5b87692c19 Merge pull request #14157 from Qwertytoforty/Salt-is-a-way-of-life
Makes human meats flavor more accurate to the feelings of the owner
2020-08-31 23:06:00 +01:00
Oyu-De
52a17762fd Fixed "Equipement" to "Equipment" 2020-08-31 20:40:27 +03:00
joep van der velden
a1db521858 Add the borg bash as well 2020-08-31 09:36:47 +02:00
Cocacolagua
754593c071 bone reinforcement rename 2020-08-29 18:53:44 -03:00
SabreML
b3aac736df Allows the AI to speak all (common) languages 2020-08-29 05:21:12 +01:00
variableundefined
ec9e32e739 Merge pull request #14121 from AffectedArc07/restores-glass-transfer
Restores ability to set transfer amount on glasses
2020-08-28 14:14:42 -04:00
SabreML
2cc57af65e Moved 'no_wrap' to object 2020-08-28 12:52:39 +01:00
SabreML
0ff9a51ba4 Adds 'no_wrap' list, including twohanded items. 2020-08-28 06:23:10 +01:00
AffectedArc07
ebba3a322b Merge pull request #13703 from Fox-McCloud/tg-flying-floating-float-refactor
TG Flying+Floating Refactor
2020-08-27 20:08:35 +01:00
Qwertytoforty
e3768e8ac5 Makes human meat more accurate to the feelings of the owner 2020-08-27 12:02:15 -04:00
TDSSS
ada7ddb605 shotguns come preloaded with buckshot now 2020-08-27 14:49:52 +02:00
AffectedArc07
b081cce749 Merge pull request #14108 from ExusA/small-clothing
Reclassifies most clothing as Small
2020-08-26 20:42:42 +01:00
AffectedArc07
04a02eaed4 Merge pull request #14137 from dearmochi/ghost-spawns-fixes
Adds chat message when polling for candidates, fixes blob offspring alert and preferences being ignored
2020-08-26 20:38:29 +01:00
Dovixx
eb2f5c03f2 Cancel now cancels 2020-08-25 15:54:45 +03:00
AffectedArc07
4615f540d9 Merge pull request #14110 from SabreML/AI-Voice-Format
Separates the AI Announcement noises from the words
2020-08-24 10:52:03 +01:00
AffectedArc07
58e1f0d55c Merge pull request #14030 from SabreML/Tourist-Suit
Adds the Tourist Outfit as a wearable shirt.
2020-08-24 10:48:25 +01:00
Kyep
5b205d2a34 fix #14095 - invisible sea carp, broken honk koi 2020-08-24 00:30:21 -07:00
mochi
a0278345f0 Fix missing poll icons, chage holopara icons 2020-08-24 08:45:20 +02:00
AffectedArc07
801bfea049 Merge pull request #14115 from Deelite34/Night-mode-tweak
Dark chat tweaks
2020-08-22 19:33:38 +01:00
SteelSlayer
43c873adb8 Anchors the ticket machine 2020-08-22 01:21:58 -05:00
AffectedArc07
edd455e656 Merge pull request #14117 from TDSSS/wizcrash-fix
Fixes #14116
2020-08-20 13:58:14 +01:00
TDSSS
6b19caa08f Now with one less slash 2020-08-20 13:07:40 +02:00
AffectedArc07
7e2546827f Restores ability to set transfer amount on glasses 2020-08-20 12:06:18 +01:00
TDSSS
1e895b374b derp in description 2020-08-20 01:12:46 +02:00
TDSSS
94e50ca22b Fixes my stupid mistake 2020-08-20 01:06:21 +02:00
Deelite34
8655b62125 Span instead of copypaste 2020-08-19 22:28:51 +02:00