Commit Graph

21280 Commits

Author SHA1 Message Date
Seris02
9028169caf fixed? 2020-02-22 20:16:40 +08:00
Seris02
68f15e16e7 fixed 2020-02-22 20:06:35 +08:00
Seris02
c3ec44b0d0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics 2020-02-22 19:54:10 +08:00
Seris02
88ae429720 runtime fix 2020-02-22 19:45:57 +08:00
Seris02
84d08fe122 firebreath change + update to tg genetics + calc patch 2020-02-22 19:42:33 +08:00
Putnam
d328d554ba Reduced copypasta 2020-02-22 02:38:57 -08:00
kevinz000
f6542b381c Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-21 23:29:25 -07:00
kevinz000
b8d60a33bd partial fix 2020-02-21 23:29:13 -07:00
kevinz000
856af1f182 Merge pull request #10848 from Ghommie/Ghommie-cit229
Porting Floyd Materials: Trying again edition
2020-02-21 23:28:44 -07:00
Detective Google
ca29246878 adds the loudness booster(instruments) and Encryption key slot to pAIs. (lazy tg port 2.) 2020-02-22 00:02:49 -06:00
kevinz000
5a580dda20 Update suppression.dm 2020-02-21 18:18:37 -07:00
kevinz000
24ba8b4d04 Update haste.dm 2020-02-21 18:17:54 -07:00
kevinz000
f2a17b8b35 Update robot_mobility.dm 2020-02-21 18:17:07 -07:00
Ghommie
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
Hatterhat
6dbd58b5df i really fucked this up please advise 2020-02-21 16:07:41 -06:00
kevinz000
665e95d827 compile 2020-02-21 15:03:22 -07:00
kevinz000
e85699df50 compile fix 2020-02-21 14:18:45 -07:00
kevinz000
a784a74ccb Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-21 13:35:26 -07:00
Trilbyspaceclone
9d414bd5a7 Yikes my bad 2020-02-21 15:29:56 -05:00
Trilbyspaceclone
9578c69f77 Update hivelord.dm 2020-02-21 15:24:27 -05:00
Putnam
0f9bda8f90 wow okay make it do this instead 2020-02-21 11:53:16 -08:00
Putnam
8e865a5081 Made power increase with raw damage. 2020-02-21 11:37:17 -08:00
YakumoChen
418374be06 beegion 2020-02-21 17:56:14 +00:00
Ghom
42416483e7 Merge pull request #11175 from keronshb/NaniteFixes
Fixes healing nanites
2020-02-21 16:46:19 +01:00
Winter Flare
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
Artur
e08c89ce48 Reverts some 2020-02-21 15:10:39 +02:00
Winter Flare
34c8315c2f I forgot to hit save. 2020-02-21 07:26:32 -05:00
Winter Flare
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
YakumoChen
2f2ddbad5a removes density from skulls 2020-02-21 12:07:58 +00:00
YakumoChen
34f1b5d1c8 legion heads now swarm 2020-02-21 10:36:57 +00:00
TrilbySpaceClone
9ae903187f always abuzz 2020-02-21 04:18:24 -05:00
Putnam
146b2a35f2 fixed temp flavor text (for real) 2020-02-21 00:26:42 -08:00
TrilbySpaceClone
7d8f1320b3 it looks nicer 2020-02-21 03:07:42 -05:00
Trilbyspaceclone
58df6486cb Hey hey people, grammar here. 2020-02-21 03:06:38 -05:00
Trilbyspaceclone
f35ee95d67 Update heart.dm 2020-02-21 01:54:23 -05:00
raspyosu
28485ea108 Merge remote-tracking branch 'upstream/master' 2020-02-21 01:48:50 -05:00
raspyosu
4de8391ba4 fix filenames zzzz
does this work even time to fIND OUT
2020-02-21 01:40:35 -05:00
raspyosu
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
Trilbyspaceclone
4542afa537 Update trek.dm 2020-02-21 01:14:09 -05:00
Detective-Google
87f0faba00 0.png 2020-02-21 00:13:04 -06:00
Detective-Google
1c5d8a2c2c changes COCK GIRTH from a measurement of circumference to a measurement of diameter (because who the fuck measures their dick CIRCUMFERENCE); hopefully fixes everyone having a chode. 2020-02-20 23:47:01 -06:00
Detective Google
04f6559b3d fixes the janky jobs panel 2020-02-20 23:12:28 -06:00
Detective Google
141bd96430 man FUCK psychs 2020-02-20 22:46:37 -06:00
Hatterhat
07222cfd9a *snap 2020-02-20 22:21:25 -06:00
Detective Google
4c10c830bf Merge remote-tracking branch 'upstream/master' into psych+paramedic 2020-02-20 22:17:55 -06:00
Detective Google
a8f863f901 changes - sprites 2020-02-20 22:17:47 -06:00
Trilbyspaceclone
38f243e1c2 Update language_holder.dm 2020-02-20 22:15:32 -05:00
Ghom
aceb76283f Merge pull request #11176 from Putnam3145/why-what
Fixing IRV again or: how I learned to start worrying and actually hate byond
2020-02-21 03:50:47 +01:00
Putnam
9f9881b57e this is so sad 2020-02-20 18:43:36 -08:00
Ghom
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