ba81184fef
Merge branch 'master' into quickpatch-enzyme
2020-02-22 18:06:17 -06:00
60b4c10215
Fish Category, Misc Moves
2020-02-22 19:02:43 -05:00
b89a2314a2
mmm that's compiling i don't like that
2020-02-22 16:17:51 -06:00
0c558f53d9
Merge pull request #11179 from Trilbyspaceclone/patch-290
...
AIs now understand dwarf
2020-02-22 22:49:08 +01:00
99475488d3
mistake
2020-02-22 15:45:06 -06:00
accc4ce776
grammar shit, silkstring buff, arrow costs, yikes
2020-02-22 15:33:07 -06:00
520f5eab83
Merge pull request #11191 from YakumoChen/beelord
...
Beegions
2020-02-22 22:24:20 +01:00
6f181365c2
Merge pull request #11172 from Trilbyspaceclone/bows!
...
Bow corrections.
2020-02-22 15:53:27 +01:00
b7fab93209
Merge pull request #11186 from Putnam3145/fixed-flavor
...
Fixed temp flavor text (for real)
2020-02-22 15:09:58 +01:00
d328d554ba
Reduced copypasta
2020-02-22 02:38:57 -08:00
856af1f182
Merge pull request #10848 from Ghommie/Ghommie-cit229
...
Porting Floyd Materials: Trying again edition
2020-02-21 23:28:44 -07:00
ca29246878
adds the loudness booster(instruments) and Encryption key slot to pAIs. (lazy tg port 2.)
2020-02-22 00:02:49 -06:00
8fbfd07692
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229
2020-02-22 00:55:32 +01:00
0f9bda8f90
wow okay make it do this instead
2020-02-21 11:53:16 -08:00
8e865a5081
Made power increase with raw damage.
2020-02-21 11:37:17 -08:00
418374be06
beegion
2020-02-21 17:56:14 +00:00
42416483e7
Merge pull request #11175 from keronshb/NaniteFixes
...
Fixes healing nanites
2020-02-21 16:46:19 +01:00
d112556ea3
Fix, New Category, file renames.
...
Remove Sweets Category
Add Donut Category
Rename recipies_sushi.dm to recipies_eastern_fish.dm (for sorting in the UI)
Rename recipies_pie.dm to recipies_pie_sweets.dm
Remove Onigiri from Misc (It's in Eastern)
2020-02-21 09:34:13 -05:00
e08c89ce48
Reverts some
2020-02-21 15:10:39 +02:00
34c8315c2f
I forgot to hit save.
2020-02-21 07:26:32 -05:00
79967b0ac5
Resolving some convos.
...
Rename Pastries to Pastry & Sweets
Move all sweets to Pastry & Sweets
Revert Weight Class Changes
Add Whitelist to trays. Glasswear, Drinks, Foods, Kitchen Items, ect.
Move Brioche Cake item/recipe
Move Scotch Egg item/recipe
2020-02-21 07:16:39 -05:00
2f2ddbad5a
removes density from skulls
2020-02-21 12:07:58 +00:00
34f1b5d1c8
legion heads now swarm
2020-02-21 10:36:57 +00:00
146b2a35f2
fixed temp flavor text (for real)
2020-02-21 00:26:42 -08:00
7d8f1320b3
it looks nicer
2020-02-21 03:07:42 -05:00
58df6486cb
Hey hey people, grammar here.
2020-02-21 03:06:38 -05:00
f35ee95d67
Update heart.dm
2020-02-21 01:54:23 -05:00
28485ea108
Merge remote-tracking branch 'upstream/master'
2020-02-21 01:48:50 -05:00
4de8391ba4
fix filenames zzzz
...
does this work even time to fIND OUT
2020-02-21 01:40:35 -05:00
7d769b3984
preemptive lunge buff
...
range increased by 1
windup length decreased by 0.1s to 0.6s
grabbing system altered to make grabbing more instantaneous depending on range
telegraphing sound now plays to the user as well for feedback
2020-02-21 01:34:22 -05:00
4542afa537
Update trek.dm
2020-02-21 01:14:09 -05:00
141bd96430
man FUCK psychs
2020-02-20 22:46:37 -06:00
4c10c830bf
Merge remote-tracking branch 'upstream/master' into psych+paramedic
2020-02-20 22:17:55 -06:00
a8f863f901
changes - sprites
2020-02-20 22:17:47 -06:00
38f243e1c2
Update language_holder.dm
2020-02-20 22:15:32 -05:00
8395ee53e7
Merge pull request #11156 from Psody-Mordheim/Plzgibsynthflesh
...
Virology Symptom Update : Now Featuring EVEN MORE PWRGAME
2020-02-21 02:47:18 +01:00
e92183e968
Merge pull request #10541 from Detective-Google/the-p-o-o-l
...
adds the POOL to box station
2020-02-21 02:43:04 +01:00
7a1bc9d22b
Fixes the travis issues
...
Fixes the travis issues, Exo still remains a mystery
2020-02-20 19:11:04 -05:00
4ca9eb4171
Fixes healing nanites
...
Fixes Accelerated Regeneration, Bio Regen, and Mechanical.
Also changed one line on Exo nanites but it doesn't fix those. Dunno what to do.
2020-02-20 18:11:54 -05:00
613158fe4e
Merge pull request #11157 from Putnam3145/lick-pref
...
Lick pref
2020-02-20 20:53:27 +01:00
4649183a47
Merge pull request #11154 from Kraseo/fuck-nightmares
...
Fixes nightmares deleting guns with flashlights
2020-02-20 20:52:29 +01:00
7763475b83
Merge pull request #10572 from Tupinambis/SiliconDefault
...
Removes harm prevention clause indicators from relevant sources.
2020-02-20 15:33:27 +01:00
6347dab0a3
Merge pull request #11142 from kevinz000/vampire_haste
...
makes vampire haste more reliable and slightly less of an example of how not to code
2020-02-20 15:31:39 +01:00
608bb0a04c
Merge pull request #10649 from kevinz000/hijack
...
Completely reworks the hijack objective, and shuttle hijacking in general
2020-02-20 14:40:08 +01:00
ca777c6c8b
Merge pull request #11153 from Ghommie/Ghommie-cit587
...
Fixing addiction moodlets not going away and secret sauce recipe paper.
2020-02-20 06:17:33 -07:00
5d76d33683
Merge remote-tracking branch 'Upstream/master' into Solar_updates
2020-02-20 13:15:46 +02:00
35aecac620
Disgust mood for bloodsuckers being disgusted, and blood bag inneficency
2020-02-20 12:50:25 +02:00
26bbc64f16
Merge pull request #11136 from Owai-Seek/broomport-2-17-19
...
Ports Broom, Tweak Janitor Vendor
2020-02-20 11:48:06 +01:00
d680ab9fd5
Merge pull request #11025 from Arturlang/TGUI_Next_Nanites
...
Ports TGUI Next and a lot of misc updates for nanites.
2020-02-20 11:27:48 +01:00
32c001f264
Merge pull request #11140 from Citadel-Station-13/kevinz000-patch-15
...
buffs pai radio short 5 -> 3 minutes
2020-02-20 11:26:17 +01:00
Hatterhat