Hatterhat
5a9208bc42
shit whoops
2020-02-14 16:29:17 -06:00
Hatterhat
3b873d4000
thanks ghommie
2020-02-14 16:28:39 -06:00
Ghom and GitHub
64882b8a90
Merge pull request #10993 from Linzolle/bows
...
adds the bow
2020-02-14 08:01:12 +01:00
Hatterhat
b2e3243760
there's no way this should have worked
2020-02-13 21:32:27 -06:00
kevinz000
eca0e0f2dc
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-02-13 00:39:20 -07:00
kevinz000
70e752dbc9
this is totally not laggy
2020-02-11 23:45:22 -07:00
Winter Flare
5549cd93f1
Merge branch 'master' into tinytweaks-2-9-20
2020-02-11 07:20:16 -05:00
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
Linzolle
c5bbce0928
add the BOW
2020-02-09 18:36:36 -06:00
Arturlang and GitHub
29207b22fb
Merge branch 'master' into debug_outfit_updates
2020-02-09 22:05:26 +02:00
Artur
c9dc35fd9a
Updates the debug outfit
2020-02-06 18:42:23 +01:00
kevinz000
6a8a606f97
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-02-04 16:01:25 -07:00
Ghommie
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
Putnam
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
Ghom and GitHub
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
Ghom and GitHub
97be223b0b
Merge pull request #10799 from Seris02/goldentoolboxfix
...
makes the golden ""plastitanium"" toolbox actually plastitanium
2020-02-02 19:08:16 +01:00
Ghom and GitHub
8a81ba9efe
Ok here we go.
2020-02-02 18:40:06 +01:00
kevinz000 and GitHub
c94b5688db
Merge pull request #10810 from YakumoChen/ring
...
Adds ring jewelry
2020-02-02 03:16:01 -07:00
kevinz000 and GitHub
3fc832fbe7
Merge pull request #10819 from Ghommie/Ghommie-cit541
...
clown ops infiltrator consistency.
2020-02-02 01:39:08 -07:00
Ghommie
95db5084ab
Screw commit history.
2020-02-02 01:26:04 +01:00
Ghommie
ab4aa29576
clown ops infiltrator consistency.
2020-02-01 00:02:31 +01:00
YakumoChen and GitHub
4c4fda8091
line ending
2020-01-31 14:14:34 +00:00
YakumoChen and GitHub
89134d8b30
updates fancy
...
the boxes actually work now
2020-01-31 08:52:45 -05:00
YakumoChen and GitHub
1ed4b90e5f
update fancy
2020-01-31 07:14:58 -05:00
YakumoChen and GitHub
065691ca1e
adds ring boxes to fancy
2020-01-31 06:33:13 -05:00
Seris02
81039b131b
fixes
2020-01-31 09:49:08 +08:00
Commandersand
27c915ec75
honk
2020-01-30 02:04:48 -06:00
kevinz000
611fd7ea89
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-01-27 23:35:35 -07:00
kevinz000
75e1108f33
optizmize
2020-01-24 21:45:43 -07:00
Putnam
c58b4daa35
collectors too
...
this doesn't compile but like. it's a draft
2020-01-24 11:58:58 -08:00
Ghom and GitHub
5bc7229a9f
Quick rubber toolbox materials fix.
2020-01-20 19:11:43 +01:00
kevinz000
7bcb37c5d1
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-01-16 21:12:56 -07:00
AffectedArc07
16a37e2769
Standardises all files from CRLF to LF
2020-01-12 14:28:01 +00:00
kevinz000
24c1baddd0
compile compile compile
2020-01-10 05:50:19 -08:00
Lin and GitHub
e5e2e4f012
Merge pull request #10329 from Ghommie/Ghommie-cit490
...
Ports reagents id removal and typepath usage.
2020-01-10 01:34:39 +00:00
Lin and GitHub
c4cb06f8f0
Merge pull request #10112 from Ghommie/Ghommie-cit447
...
Refactors that mess of a code for alternate worn clothing sprites for digitigrade and taurs.
2020-01-10 01:31:20 +00:00
Ghommie
825b4f01c2
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490
2020-01-10 02:26:19 +01:00
Putnam3145 and GitHub
b09ef97ae3
Merge pull request #10305 from BlackMajor/Yeehaw
...
Various Mining borg changes. And some extras.
2020-01-07 16:50:21 -08:00
BlackMajor
05a644cc41
Revert "Merge branch 'master' into Yeehaw"
...
This reverts commit 972c03f79f8ebd698763
2020-01-08 12:26:45 +13:00
BlackMajor
972c03f79f
Merge branch 'master' into Yeehaw
2020-01-08 12:25:50 +13:00
BlackMajor
b41c9cd844
Sync with master
2020-01-08 12:25:22 +13:00
Lin and GitHub
c162e9bb5d
Merge pull request #10453 from Ghommie/Ghommie-cit500
...
Fixing an edge case runtime with ore bags.
2020-01-07 19:37:49 +00:00
kevinz000
7378d91684
([\W\.])Knockdown\(
2020-01-06 03:39:20 -08:00
Ghommie
4cc0833b28
Fixing an edge case runtime with ore bags.
2020-01-06 01:45:53 +01:00
Hatterhat
7c98656939
upstream merge
2020-01-04 01:48:50 -06:00
Hatterhat
186194418e
tg 43454+43688 port, tweaks w/ trilby, db crate
2020-01-04 01:33:32 -06:00
Ghommie
f5b251db66
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490
2020-01-03 18:24:39 +01:00
Ghommie
4d06d231f8
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490
2020-01-02 17:49:01 +01:00
BlackMajor
08d042901c
thank you github
2020-01-02 22:16:47 +13:00
BlackMajor
aabb39a364
Revert "Merge branch 'master' into Yeehaw"
...
This reverts commit 30e3edaac162c8fce043
2020-01-02 22:06:31 +13:00
Hatterhat