Winter Flare
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
CitadelStationBot
a840b16c87
Automatic changelog generation for PR #10930 [ci skip]
2020-02-08 22:12:40 -06:00
kevinz000
3264596bac
Merge pull request #10930 from r4d6/meteor-alt-2
...
Put the meteor timer to 3-5 minutes
2020-02-08 21:12:38 -07:00
r4d6
49f2993c59
Correct timer
2020-02-08 23:09:51 -05:00
CitadelStationBot
a3f1ef19c7
Automatic changelog generation for PR #10918 [ci skip]
2020-02-08 22:01:28 -06:00
kevinz000
1f959012c5
Merge pull request #10918 from r4d6/dwarf-config
...
Add dwarves as a round-start race
2020-02-08 21:01:26 -07:00
Ghom
2a0ba12896
Merge pull request #10952 from Citadel-Station-13/kevinz000-patch-11
...
gun qdel fix
2020-02-09 02:53:38 +01:00
kevinz000
b8337a0523
Merge pull request #10959 from Arturlang/TGUI_Next_Autobuild
...
TGUI Next autobuilding
2020-02-08 18:47:20 -07:00
Ghom
865a17e8e4
Fallback for linter.
2020-02-09 02:39:21 +01:00
Arturlang
25848bf37e
Merge pull request #4 from Ghommie/Ghommie-helpies
...
updating dependencies and tgstation PRs #48122 , #48241 , #48673
2020-02-09 03:29:28 +02:00
Ghommie
187d9fdb43
updating dependencies and #48122 , #48241 , #48673
2020-02-09 01:57:12 +01:00
Arturlang
4cce3785a5
Merge pull request #3 from Ghommie/Ghommie-helpies
...
More help
2020-02-09 02:06:16 +02:00
Ghommie
6152ac9235
tgstation PR #48090
2020-02-09 00:56:31 +01:00
Ghommie
9a2107bf1a
This one too.
2020-02-09 00:48:14 +01:00
Arturlang
56bbf52f1e
Merge pull request #2 from Ghommie/Ghommie-helpies
...
Adding execute file permissions to build_tgui.sh
2020-02-09 01:19:52 +02:00
Ghommie
c665ed7e36
Cecilia need helpies in maint, nya
2020-02-09 00:05:17 +01:00
Ghommie
94e3b17faf
Merge branch 'TGUI_Next_Autobuild' of https://github.com/Arturlang/Citadel-Station-13 into Ghommie-helpies
2020-02-09 00:03:39 +01:00
CitadelStationBot
3a9ac36286
Automatic changelog generation for PR #10942 [ci skip]
2020-02-08 16:31:36 -06:00
Ghom
f27ce86769
Merge pull request #10942 from Putnam3145/map-vote-options
...
Added a config for map voting types
2020-02-08 23:31:33 +01:00
Ghom
0bbf1efa67
Merge pull request #10762 from kevinz000/one_last_taser_attempt
...
One last attempt at balancing tasers (and some adv egun stuff)
2020-02-08 23:30:41 +01:00
Artur
3fe246ad45
Redo
2020-02-08 13:47:25 +01:00
Artur
65d1552208
Lets see if this works
2020-02-08 13:46:58 +01:00
CitadelStationBot
1f506e2f28
Automatic changelog generation for PR #10974 [ci skip]
2020-02-08 02:36:13 -06:00
kevinz000
682637ee67
Merge pull request #10974 from Putnam3145/antag-why-the-hell
...
Fixed antag quirk blacklisting
2020-02-08 01:36:11 -07:00
Putnam
611c850639
all you need to understand is everything you know is wrong
2020-02-08 00:31:46 -08:00
kevinz000
c6c1cc484c
slight buff
2020-02-07 23:40:02 -07:00
kevinz000
826ed7d4f2
o k.
2020-02-07 23:39:09 -07:00
kevinz000
79a72fac24
fix
2020-02-07 23:32:36 -07:00
kevinz000
7c16830e91
ok
2020-02-07 23:31:38 -07:00
Putnam
c45dab8ebd
uhh?
2020-02-07 20:37:22 -08:00
CitadelStationBot
72a285bb4d
Automatic changelog generation for PR #10960 [ci skip]
2020-02-07 22:12:22 -06:00
Ghom
c6f9f7119e
Merge pull request #10960 from kappa-sama/patch-11
...
lavaland plant disk techdisk actually works
2020-02-08 05:12:19 +01:00
CitadelStationBot
c9852db022
Automatic changelog generation for PR #10966 [ci skip]
2020-02-07 22:06:25 -06:00
Ghom
278a9cf9ae
Merge pull request #10966 from r4d6/mininge
...
Fix mining base having holes to space
2020-02-08 05:06:22 +01:00
r4d6
f4c148d44f
Fix mining base having holes to space
2020-02-07 22:58:47 -05:00
Putnam
84a9f2f058
make the fallback majority judgement
2020-02-07 19:54:15 -08:00
kappa-sama
8c2019fcbf
probably fixes plant disk techdisk
2020-02-07 17:58:36 -05:00
CitadelStationBot
853c66426b
Automatic changelog generation for PR #10935 [ci skip]
2020-02-07 16:23:59 -06:00
Ghom
07535ff565
Merge pull request #10935 from KrabSpider/van-dyke
...
Returns the Van Dyke mustache to its former glory
2020-02-07 23:23:56 +01:00
CitadelStationBot
1200628e35
Automatic changelog generation for PR #10892 [ci skip]
2020-02-07 16:13:24 -06:00
Ghom
71f44a7085
Merge pull request #10892 from kevinz000/small_guncode_refactor
...
Small guncode refactor but it works
2020-02-07 23:13:21 +01:00
CitadelStationBot
6f3bec3ba3
Automatic changelog generation for PR #10774 [ci skip]
2020-02-07 15:44:22 -06:00
Ghom
9c14d03051
Merge pull request #10774 from Citadel-Station-13/kevinz000-patch-2
...
nuke explosion is 512 dev which is actually less laggy than heavy + light
2020-02-07 22:44:20 +01:00
CitadelStationBot
ea096a79ee
Automatic changelog generation for PR #10957 [ci skip]
2020-02-07 15:41:51 -06:00
Ghom
1dfba9f416
Merge pull request #10957 from Putnam3145/fix-occasional-dynamic-runtime
...
Fixes a spurious dynamic runtime if nobody votes
2020-02-07 22:41:48 +01:00
Lin
5717700146
Merge pull request #10925 from Ghommie/Ghommie-cit558
...
runtime is forever, errors are eternal.
2020-02-07 17:29:49 +00:00
Artur
b615be1248
Should hopefully work..
2020-02-07 18:20:09 +01:00
Putnam
b4faac50a9
yeah "null" is bad juju. why did i do that
2020-02-07 04:41:16 -08:00
Putnam
27efd54274
why was that else there. why
2020-02-07 04:38:39 -08:00
Putnam
7f0a369870
Also added options for custom votes
2020-02-07 04:29:53 -08:00
