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
Ghommie
d4c74c19de
Something about cryopods.
2020-02-10 04:26:50 +01:00
Ghom
96a240bc11
Merge pull request #10984 from Trilbyspaceclone/patch-277
...
Makes heads of staff no longer come to work as a gang leader
2020-02-10 03:51:49 +01:00
Linzolle
63be3300d2
actually
2020-02-09 19:52:44 -06:00
DeltaFire
55a5686c01
No more Narsie runes in half the time or less
...
Why exactly are we allowing cultists to write nar nar with half the time on runed floors? So thats why people are always too late...
2020-02-10 02:46:54 +01:00
Linzolle
4622f66162
for real this time
2020-02-09 19:45:22 -06:00
Hatterhat
d24afcde1b
pb burst from 60 to 81
2020-02-09 19:07:24 -06:00
Linzolle
c5bbce0928
add the BOW
2020-02-09 18:36:36 -06:00
keronshb
1492586f76
Fixes round 3? 4?
...
Should fix the last round of requests?
2020-02-09 18:18:55 -05:00
Ghom
33688dbe93
Merge pull request #10981 from IHOPMommyLich/AdrenalsChange
...
Nerfing Stimulants
2020-02-09 23:56:52 +01:00
keronshb
60a3b134a3
Should fix the rest of the requested changes
...
Title
2020-02-09 17:30:22 -05:00
Ghom
3a2eb8c1ad
Update experimental_dissection.dm
2020-02-09 22:50:43 +01:00
Ghom
c7614958bc
Merge pull request #10937 from Arturlang/debug_outfit_updates
...
Updates the debug outfit
2020-02-09 22:49:22 +01:00
Ghom
c2baad44d8
Merge pull request #10277 from kevinz000/god_wish_your_plushies_holy_shit
...
ENDS THE PLUSHIE DRAMA
2020-02-09 21:47:30 +01:00
Ghom
0f2f5ab639
Merge pull request #10936 from Citadel-Station-13/kevinz000-patch-7
...
Cyborging someone will now be able to force-remove gang lead status, much like how it can force-deantag headrevs and bloodsuckers
2020-02-09 21:38:50 +01:00
keronshb
9609eb64e0
Fixes some files and pathings for this
...
Adds proper subtypes, put the health down a lil bit for the turret, fixed the welder type, added some tiny fans to the ship and also added some plastitanium windows where r-windows were
2020-02-09 15:18:15 -05:00
Ghom
101640170b
Merge pull request #10954 from Citadel-Station-13/kevinz000-patch-9
...
repulse sanity
2020-02-09 21:09:00 +01:00
Ghom
d991fa1252
Merge pull request #10972 from Trilbyspaceclone/so-then-I-started-nerfing
...
Removes bone armor and dagger from crafting menu
2020-02-09 21:08:16 +01:00
Arturlang
29207b22fb
Merge branch 'master' into debug_outfit_updates
2020-02-09 22:05:26 +02:00
r4d6
e4f2af2d77
compile
2020-02-09 07:34:21 -05:00
r4d6
9ba0a1b470
Code update
2020-02-09 07:21:47 -05:00
Ghom
bcbaea4a7b
CallMaterialName reagent fix
2020-02-09 10:46:29 +01:00
YakumoChen
1c24797de1
revert 10486
2020-02-09 06:41:13 +00:00
Ghommie
f6adce72fb
Something about missing private sprites and their bad code.
2020-02-09 06:51:57 +01:00
r4d6
e6398815b6
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Dwarf
2020-02-08 23:23:28 -05: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
r4d6
5316cc3665
Make dwarves not have an accent when speaking dwarvish
2020-02-08 23:02:32 -05:00
r4d6
a8403cb072
Make Dwarves heal from Plump Helmet
2020-02-08 22:40:17 -05:00
Ghom
506f1199ad
I have a bad habit to edit people's (especially trilby) PRs out of the wild. Sorry
2020-02-09 02:56:17 +01: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
Ghom
ea9bdcd087
Update gangs.dm
2020-02-09 02:49:20 +01:00
Trilbyspaceclone
90a1b249f1
Update gangs.dm
2020-02-08 20:39:45 -05:00
Ghommie
98a525568f
Ok.
2020-02-08 23:59:20 +01:00
Ghommie
3485d82dd0
salty digi man bad.
2020-02-08 23:58:05 +01: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
IHOPMommyLich
860c8136df
Lowers the movespeed provided by Stimulants, weakening Stimpacks and Adrenals.
2020-02-08 17:01:12 -05:00
Ghommie
eaa6bc2db5
fixing another issue with the hear comsig proc.
2020-02-08 19:37:18 +01:00
Putnam
611c850639
all you need to understand is everything you know is wrong
2020-02-08 00:31:46 -08:00
TrilbySpaceClone
612b5c5da3
better name
2020-02-08 03:27:43 -05:00
TrilbySpaceClone
5dbfc9a514
Yay
2020-02-08 03:25:09 -05:00
TrilbySpaceClone
30c78c5be2
Let their be lists
2020-02-08 02:37:37 -05:00
Seris02
0b1cb9db6d
timer'd
2020-02-08 15:25:11 +08:00
TrilbySpaceClone
76219e0188
Primortial
2020-02-08 02:21:14 -05: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
Seris02
6d8bfd2a38
tru
2020-02-08 14:01:51 +08:00
