Winter Flare
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
Ghom
121b37410a
Merge pull request #10997 from Owai-Seek/tinytweaks-2-9-20
...
Sprites, Tweaks, and Snacks, QoL
2020-02-13 16:40:12 +01:00
Winter Flare
3b5ec22076
Vendor Nerf
2020-02-13 03:54:31 -05:00
ShadeAware
195760e572
h
2020-02-12 16:37:00 -05:00
ShadeAware
0f603f2aff
Fixes icon state for the refill
...
Thank you for the catch, Ghommie.
2020-02-12 16:34:16 -05:00
ShadeAware
5afbe44be3
Attempt Numero Dos!
...
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
2020-02-11 17:27:40 -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
kevinz000
3f5805a9e8
Merge pull request #10798 from necromanceranne/secmainsrejoice
...
Formal security wear are now armor vests (HAS SOME BALANCE CONCERNS)
2020-02-06 23:52:49 -07:00
Trilbyspaceclone
b7613a43ae
corrects this missing sprite
2020-02-04 16:23:36 -05:00
TrilbySpaceClone
06fd6645b3
And it wokrs
2020-02-04 16:01:22 -05:00
Ghom
96a38e6c18
Merge pull request #10837 from Owai-Seek/tinytweaks
...
Tweaking Chef Vendor, Blood Crate, and Cake Recipe
2020-02-02 18:07:25 +01:00
Winter Flare
59b5b0b9a6
A bunch of tiny tweaks.
...
Added additional blood types to blood crate.
Added Soy Sauce packet.
Added Soy Sauce and BBQ packet to chef vendor.
Changed Birthday Cake recipie to mirror TG.
2020-02-01 04:49:56 -05:00
necromanceranne
43c4debb4f
Repaths the formal security items into armor vest subtypes and subtypes of their respective owner's armors. Probably has some really silly balance ramifications. Oh and russian officers have armor vests now I guess. Oh and the sec wardrobe no longer has the formal suits.
2020-01-31 11:54:18 +11:00
Seris02
dbb6218e0d
merp
2020-01-30 14:54:07 +08:00
Ghommie
5875f2578c
demodularize and removes lot of unused clothing with missing sprites.
2020-01-28 02:32:46 +01:00
kevinz000
ea9513864d
Merge pull request #10674 from Xantholne/lunar01
...
Culturally Appropriate Lunar Clothes
2020-01-24 16:14:32 -07:00
Unknown
bd8ce9a7b6
Culturally Appropriate Lunar Clothes
2020-01-23 06:35:50 -07:00
Winter Flare
3d85499919
Requested Changes + Nerf
...
Nerf cannabis bounties, comment out monkey cube bounty, change to shady jims.
2020-01-23 07:20:22 -05:00
Winter Flare
bd30b44919
Bounty Reorganisation and Rebalance
...
Reorganises several bounties.
Rebalances or Buffs Skateboard, Stunprod, Shady Jims, Gas Mask, Soup, Ice Cream Sandwiches, Popcorn, Onion Rings, Night Vision Goggles, Tool Belts, possibly others.
Moves:
Khinkali to Chef Bounties
Super Bite to Chef Bounties
Poppy Pretzels to Chef Bounties
Adds:
Fiesta Skewer Bounty
Pneumatic Cannon Bounty
BBQ Ribs Bounty
Add's Trillby's Toy Sword Bounty
Fix:
Shady Jims were unobtainable, they are now obtainable.
2020-01-18 21:59:03 -05:00
Hatterhat
7b322ff467
Merge branch 'master' into greytide-standard-uniform
2020-01-14 19:39:16 -06:00
Xantholne
903e59d6ed
Merge branch 'master' into xantholne-christmas03
2020-01-12 22:29:59 -07:00
Hatterhat
7fac15caeb
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into greytide-standard-uniform
2020-01-12 12:39:57 -06:00
Hatterhat
47fd3823e8
staff assistant jumpsuit gang
2020-01-11 15:58:24 -06:00
Lin
fb94bf5fa0
Merge pull request #10482 from kappa-sama/modularthing
...
modular citadel file destruction but only slightly
2020-01-11 00:30:58 +00:00
Unknown
753c572a5e
I'm about to go into a comma
2020-01-09 11:21:00 -07:00
Unknown
62396bffb1
Clothesmate vending
2020-01-08 22:47:28 -07:00
kappa-sama
f69c67cf5c
tabs
2020-01-08 17:03:48 -05:00
kappa-sama
ceea7cd021
moves these over too
2020-01-08 16:47:22 -05:00
kappa-sama
38015d0d02
moves this
2020-01-08 16:45:52 -05:00
kappa-sama
341e076d40
refill 2
2020-01-08 16:43:47 -05:00
kappa-sama
18b78e7671
refill
2020-01-08 16:43:33 -05:00
kappa-sama
ebf8d048fd
perhaps?
2020-01-08 16:42:16 -05:00
kappa-sama
c88f58bb67
hm
2020-01-08 16:41:44 -05:00
kevinz000
5f03f5e3d8
Merge pull request #10457 from r4d6/Voice-Copy
...
Add a playback device and make the Voice Analyzer actually care about languages.
2020-01-08 13:33:54 -08:00
r4d6
6d3345d166
Add the Playback Device
2020-01-05 23:32:44 -05:00
Hatterhat
186194418e
tg 43454+43688 port, tweaks w/ trilby, db crate
2020-01-04 01:33:32 -06:00
Unknown
0b02439b08
Puts an end to the Christmas Menace
2020-01-02 03:53:04 -07:00
Ghom
78e4c608ad
Merge pull request #10319 from Seris02/coconutsyep
...
porting azarak's coconuts from hyper station
2019-12-31 13:16:07 +01:00
kevinz000
3f4594d78e
Merge pull request #10312 from Commandersand/prayfornoconflictslel
...
ports rp dresses/pants/chaps, available through loadout or vendors(without breaking my github branch)
2019-12-30 00:07:32 -08:00
Seris02
4a2b7c2438
cocooooonuuuuuuts
2019-12-28 16:02:53 +08:00
Lin
80daaacc86
Merge pull request #10268 from Ghommie/Ghommie-cit487
...
Effectively removes the old unused roboticist encryption key and headset.
2019-12-28 00:08:24 +00:00
Commandersand
1a886adc3d
FIXEdD
2019-12-27 13:01:14 -06:00
Commandersand
815e57697d
vending
2019-12-27 12:29:39 -06:00
Ghommie
4fbd9fdca0
Effectively removes the long unrequired roboticist encryption key.
2019-12-22 12:02:15 +01:00
TrilbySpaceClone
c7dbdd73df
Merge branch 'master' into donut
2019-12-22 02:36:57 -05:00
Ghom
a33065a728
Merge pull request #10190 from Trilbyspaceclone/honeysoda
...
The new buzz around the new soft drink
2019-12-21 18:34:35 +01:00
Trilbyspaceclone
0f5c8db456
Merge branch 'master' into donut
2019-12-17 15:12:51 -05:00
Trilbyspaceclone
fe1576583c
Update code/modules/vending/cola.dm
...
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com >
2019-12-16 15:01:16 -05:00
Unknown
ad88481f3e
OwO whats this notices your
2019-12-15 16:45:34 -07:00
Unknown
008c4ef822
according to all known laws of aviation
2019-12-15 16:18:42 -07:00
