6ac010e442
Merge branch 'master' into robocoat
2021-01-16 04:56:03 +11:00
cb40ad4764
atomization is cowardice actually
2021-01-12 16:08:17 -06:00
9c0989d233
Merge remote-tracking branch 'upstream/master' into robocoat
2021-01-09 19:02:38 +11:00
abffac67b2
Port'n
2021-01-06 03:16:08 -05:00
6650d3518a
Mostly ports tgstation #54644 ; New roboticist labcoat sprites
2021-01-04 20:45:11 +11:00
e63e0ac9bd
something about wardrobes
2020-12-31 22:03:09 -06:00
57132d0b32
Merge remote-tracking branch 'upstream/master' into clothing
2020-10-01 14:06:21 -05:00
c4480afc09
Adds a bunch of RP clothes and ports the detvendor
2020-09-30 20:50:00 -05:00
7f0834608e
Merge pull request #65 from EmeraldSundisk/Citadel-Station-13-master
...
Citadel station 13 master
2020-09-27 10:09:12 -07:00
e4f9849cc3
Adds engineering hazard jumpsuits
2020-09-25 15:40:38 -04:00
079d4eeb58
Merge pull request #63 from EmeraldSundisk/Citadel-Station-13-master
...
ffs
2020-09-24 19:18:50 -07:00
7c5de6996b
cargotech wardrobe
2020-09-19 15:41:59 -07:00
85f8c22da9
adds mech suits to robodrobe
2020-09-18 21:16:25 +00:00
6329b2a760
a
2020-07-26 23:32:36 -04:00
de77b7139c
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765
2020-06-23 00:13:14 +02:00
8cb15f9279
Actually Balanced and Standardized Vendor Prices. ( #12495 )
2020-06-09 22:22:53 -07:00
a84e7bcecc
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765
2020-05-24 04:00:51 +02:00
810da1b7c8
changes
2020-05-18 04:41:10 -07:00
30ab79e09e
Porting the twohanded component.
2020-05-17 18:16:53 +02:00
a194d7dafe
merge conflict and job/dept discounts support.
2020-05-03 02:11:05 +02:00
4c6f1b622b
Porting Goofconomy & co.
2020-04-17 07:48:11 +02:00
86898cc451
Force pushed updates
2020-03-22 01:43:19 +01:00
9066287037
Oh yea I forgot tg repathed many /under clothes a while ago.
2020-03-07 00:42:18 +01:00
e3e15ea7a4
accidental revert.
2020-03-07 00:30:10 +01:00
a817bd6115
Porting the musician and curator beacons.
2020-03-07 00:12:50 +01:00
c4113824f7
more fixes
2020-02-29 01:47:19 -06:00
ed320046c5
fixes icons
2020-02-28 11:42:15 -06:00
23c3e5b328
tweaks for the tweaks
2020-02-28 00:17:28 -06:00
12ba71f588
paramedic tweaks
2020-02-27 23:23:44 -06: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
195760e572
h
2020-02-12 16:37:00 -05:00
0f603f2aff
Fixes icon state for the refill
...
Thank you for the catch, Ghommie.
2020-02-12 16:34:16 -05:00
5afbe44be3
Attempt Numero Dos!
...
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
2020-02-11 17:27:40 -05:00
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
38015d0d02
moves this
2020-01-08 16:45:52 -05:00
4fbd9fdca0
Effectively removes the long unrequired roboticist encryption key.
2019-12-22 12:02:15 +01:00
8d09f5a082
Merge branch 'master' into tinytweaks
2019-12-01 23:24:56 -08:00
4e20f576e6
Merge branch 'master' into xantholne-berets02
2019-11-25 20:16:15 -07:00
495b4b6ddc
Fixes some issues
2019-11-25 20:13:07 -07:00
03dae580a9
Minor QoL and Wardrobe Updates
2019-11-22 14:08:12 -05:00
4974400ccb
Merge branch 'master' into xantholne-berets01
2019-11-21 11:01:42 -07:00
71b3b8fdc6
Ports/Adds new Berets
...
Ports some berets adds even more to most jobs
2019-11-20 22:21:20 -07:00
7d99508bd0
adds janitor winter coat
2019-11-17 15:45:12 +08:00
b7f4580414
robotics winter coat
2019-11-17 11:50:56 +08:00
b146fd14f3
actually adds the winter coats
2019-11-16 18:25:05 +08:00
5efed32095
Ports Welding Hard Hats from /tg/
...
Changelog:
modules/clothing/head/Hardhat.dm:
-Added Welder Hard Hats & various colours
--They function as a combi hard hat & welder mask, but have a slightly dimmer head lamp
modules/clothing/vending/wardrobes.dm
-Added 3 Welder Hard Hats to the Engi-drobe and Atmos-drobe
-Equalized some values between the two (3 atmos winter coats now instead of 5, and 3 engineering dufflebags instead of 2)
game/objects/structures/crates_lockers/closets/secure/engineering.dm
-Replaced the welding mask in the CE's locker with a white WHH (This one has brighter buld in it! Same brightness as a regular hard hat)
datums/action.dm
- Added the item_action to lower the WHH's face shield
icons/mob/head.dmi
-Added weldervisor + welderhat, which are used by the WHH's
-Recoloured hardhat0/1_dblue to be in atmos colours as I've never seen it on the station before and this way is actually used
icons/mob/obj/hats.dmi
-Added weldervisor, again, used by the WHH's
-Repositioned the hardhat sprites up several pixels so they don't clip and look weird with the weldervisor
-Recoloured hardhat0/1_dblue to be in atmos colours as I've never seen it on the station before and this way is actually used
2019-11-04 02:29:56 +00:00
41fbb759b2
Merge branch 'master' into more_cooking2
2019-09-25 14:56:11 -04:00
64b757f404
refactor suits
2019-09-07 17:10:10 -05:00
fd585aa6ea
Merge branch 'master' into more_cooking2
2019-09-03 11:22:38 -04:00
db317b65af
Grand!
2019-08-24 19:39:15 -04:00
necromanceranne