0ca58b5ed8
why though
2020-03-13 04:19:20 +00:00
480eb32c68
Merge pull request #11418 from Ghommie/Ghommie-cit615
...
Fix runtimes some more.
2020-03-11 17:01:13 -07:00
27a7f754c4
Fix runtimes some more.
2020-03-10 22:40:06 +01:00
832d894e92
Merge pull request #11388 from Owai-Seek/crabby-patty-3/1/20
...
Food Ports / Butter Bear / Food Craft Speed
2020-03-10 05:59:24 -07:00
1c5aa2f933
Merge pull request #11377 from Kraseo/contractor-fixes
...
Some contractor adjustments & fixes
2020-03-09 00:26:54 +01:00
bb9066e9cb
Food Additions / Butter Bear
...
Ports the following from TG:
Chicken Nugget Box
Crab Burger, Bisque, French Onion Soup, Crab Rangoo
Butter Bear aka Terrygold
Tweaks Bisque and Crab Rangoo recipie.
Removes Bacon from Exotic Meat crate.
Adds Spider Eggs to Exotic Meat crate.
2020-03-08 14:36:08 -04:00
5bcb38c79f
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit610
2020-03-08 02:33:27 +01:00
bbf43b0464
whoopsies almost forgot this
2020-03-07 20:48:04 +01:00
7bed0d5c87
Of runtimes and null.
2020-03-07 01:57:15 +01:00
ad20fb1a0e
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into contracties
2020-03-06 11:58:11 +01:00
2e35c09dec
Merge pull request #10451 from kevinz000/mobility_flags
...
Mobility flags + combat rework stuff refactoring, fixes a few edge cases including the Oh Dreaded Xenomorph Hardstuns, etc etc time to break the game
2020-03-05 20:03:56 -05:00
8b0b685fa7
CHECK_MOBILITY
2020-03-03 20:40:33 -07:00
1e99cd0bfe
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-03-03 03:08:41 -07:00
e3c77f2f5a
part 4: the one where i slowly go insane
2020-03-01 22:05:35 +01:00
ab48a6fa16
part 3: do people even read commit logs
2020-03-01 19:14:05 +01:00
d93ade7e03
part 2: bloody tendency
2020-03-01 17:37:18 +01:00
38f7821dd6
part 1: battle stream
2020-03-01 16:56:13 +01:00
d5c2c54f32
Update fancy.dm
2020-02-28 19:14:58 +01:00
56eab760fc
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-02-27 20:11:36 -07:00
b5f472c6dd
thank you dreamchecker
2020-02-27 01:47:18 +01:00
fc76cd9a9b
Porting update_icon improvements. Part 1.
2020-02-27 01:21:03 +01:00
f86e17d945
Merge pull request #11129 from Owai-Seek/movefood-2-16-20
...
Reorganize Food Recipes, "Balance" Tweaks
2020-02-24 20:53:36 +01:00
f6542b381c
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-02-21 23:29:25 -07: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
a784a74ccb
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-02-21 13:35:26 -07: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
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
89f256866d
Merge pull request #11033 from kevinz000/cmo_drapes
...
gives CMO special surgery drapes that can initiate techweb surgeries without operating console
2020-02-20 11:24:50 +01:00
0e4692c63d
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-02-18 18:16:34 -07:00
2b7f27270f
Merge pull request #11083 from Hatterhat/sword-cleaning
...
purifying longswords - alt title "there's no way this should have worked"
2020-02-18 19:02:34 +01:00
1a994e7f1e
Ports Broom, Tweak Janitor Vendor
...
Ports Brooms from TG https://github.com/tgstation/tgstation/pull/49120
Makes Broom printable.
Reduces Broom sound effect.
Updates Janitor Vendor to have equipment for at least 2 janitors.
2020-02-17 23:36:22 -05:00
5c2e244ee0
Ports /tg/ pr #44529 , reverts #9092
2020-02-16 22:20:50 +11:00
b60b0a95aa
you ever just forget that if statements exist
2020-02-16 02:28:12 -06:00
0f5ea361e7
bada bing bada boom
2020-02-15 14:07:35 -06:00
c9af8dc713
perhaps
2020-02-15 14:05:27 -06:00
5a9208bc42
shit whoops
2020-02-14 16:29:17 -06:00
3b873d4000
thanks ghommie
2020-02-14 16:28:39 -06:00
64882b8a90
Merge pull request #10993 from Linzolle/bows
...
adds the bow
2020-02-14 08:01:12 +01:00
b2e3243760
there's no way this should have worked
2020-02-13 21:32:27 -06:00
eca0e0f2dc
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-02-13 00:39:20 -07:00
70e752dbc9
this is totally not laggy
2020-02-11 23:45:22 -07:00
5549cd93f1
Merge branch 'master' into tinytweaks-2-9-20
2020-02-11 07:20:16 -05:00
bb641fecf8
Sprites, Tweaks, and Snacks
...
-Fixes Trash Can recipie. Now craftable with 10 metal, removed with welder.
-Adds an additional sprite for Duke Purple Tea so Tea and Coco don't look the same.
-Adds Bacon and Eggs Sprite and Food Item
-Adds Unique Sprite for Drying Agent bottle.
-Adds Chocolate Bar to the... Chocolate Vendor.
-Allows Trash Bag to fit Limbs (Not Heads)
-Allows Mops to be Printable
-Allows Bio Bags to pick up Limbs and Organs. Disallows Cybernetics, Brains, and Implants.
Ports the following from TG:
Printable Mops
https://github.com/tgstation/tgstation/pull/44141
Makes Limbs Small Weight (To Fit in Trashbags)
https://github.com/tgstation/tgstation/pull/44730
2020-02-09 23:07:32 -05:00
c5bbce0928
add the BOW
2020-02-09 18:36:36 -06:00
29207b22fb
Merge branch 'master' into debug_outfit_updates
2020-02-09 22:05:26 +02:00
c9dc35fd9a
Updates the debug outfit
2020-02-06 18:42:23 +01:00
6a8a606f97
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-02-04 16:01:25 -07:00
a726f09201
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229
2020-02-04 03:54:52 +01:00
53cad493a7
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into antag-overhaul
2020-02-03 03:17:23 -08:00
6f66d76680
Merge pull request #10705 from kevinz000/revert_poojawa_blood_1
...
Cleanup/Partial revert of RGB blood ""rework""
2020-02-02 19:08:57 +01:00
Lin