Commit Graph

48 Commits

Author SHA1 Message Date
Ghommie 86898cc451 Force pushed updates 2020-03-22 01:43:19 +01:00
Ghom 9066287037 Oh yea I forgot tg repathed many /under clothes a while ago. 2020-03-07 00:42:18 +01:00
Ghommie e3e15ea7a4 accidental revert. 2020-03-07 00:30:10 +01:00
Ghommie a817bd6115 Porting the musician and curator beacons. 2020-03-07 00:12:50 +01:00
ancientpower c4113824f7 more fixes 2020-02-29 01:47:19 -06:00
ancientpower ed320046c5 fixes icons 2020-02-28 11:42:15 -06:00
ancientpower 23c3e5b328 tweaks for the tweaks 2020-02-28 00:17:28 -06:00
ancientpower 12ba71f588 paramedic tweaks 2020-02-27 23:23:44 -06:00
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
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
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
kappa-sama 38015d0d02 moves this 2020-01-08 16:45:52 -05:00
Ghommie 4fbd9fdca0 Effectively removes the long unrequired roboticist encryption key. 2019-12-22 12:02:15 +01:00
Putnam3145 8d09f5a082 Merge branch 'master' into tinytweaks 2019-12-01 23:24:56 -08:00
Unknown 4e20f576e6 Merge branch 'master' into xantholne-berets02 2019-11-25 20:16:15 -07:00
Unknown 495b4b6ddc Fixes some issues 2019-11-25 20:13:07 -07:00
Winter Flare 03dae580a9 Minor QoL and Wardrobe Updates 2019-11-22 14:08:12 -05:00
Unknown 4974400ccb Merge branch 'master' into xantholne-berets01 2019-11-21 11:01:42 -07:00
Unknown 71b3b8fdc6 Ports/Adds new Berets
Ports some berets adds even more to most jobs
2019-11-20 22:21:20 -07:00
Seris02 7d99508bd0 adds janitor winter coat 2019-11-17 15:45:12 +08:00
Seris02 b7f4580414 robotics winter coat 2019-11-17 11:50:56 +08:00
Seris02 b146fd14f3 actually adds the winter coats 2019-11-16 18:25:05 +08:00
BonniePandora 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
TrilbySpaceClone 41fbb759b2 Merge branch 'master' into more_cooking2 2019-09-25 14:56:11 -04:00
Linzolle 64b757f404 refactor suits 2019-09-07 17:10:10 -05:00
TrilbySpaceClone fd585aa6ea Merge branch 'master' into more_cooking2 2019-09-03 11:22:38 -04:00
TrilbySpaceClone db317b65af Grand! 2019-08-24 19:39:15 -04:00
Sishen ed2c3f3cbd Fixes spelling mistakes, adds pharaoh gear to chaplain vendor 2019-08-19 13:53:05 -04:00
Thalpy 5795f6bbe2 Merge branch 'master' into master 2019-08-05 09:09:36 +01:00
kevinz000 4f0dc33d1b Merge pull request #9021 from Ghommie/Ghommie-cit174
Ports "Adds techpriest robes and adds them to the RoboDrobe"
2019-08-05 00:49:29 -07:00
TrilbySpaceClone 3a85f9473c amazing 2019-08-02 14:37:52 -04:00
Ghommie 7c9c51b777 Ports "Adds techpriest robes and adds them to the RoboDrobe" 2019-07-31 21:54:55 +02:00
Fermi d080446a77 Merge branch 'pr/20' 2019-07-28 23:28:19 +01:00
Sishen 68083aa0c6 a 2019-07-25 21:43:02 -04:00
Sishen 612021b9d5 h 2019-07-25 21:43:02 -04:00
Thalpy 15ab1a26a4 Merge branch 'master' into master 2019-07-21 01:50:41 +01:00
Ghommie 589cdae0e1 Towels 2019-07-18 00:03:49 +02:00
Thalpy 937d6467e6 Buncha fixes and QoL stuff. (pH, hypo, heater and dispencer_ 2019-06-30 19:16:27 +01:00
Fermi 79a7b6b45b Fixes. 2019-05-27 20:25:57 +01:00
Fermi 91f10442cf Merge branch 'pr/12' 2019-05-26 02:05:48 +01:00
Trilbyspaceclone 65dfca1c18 Update wardrobes.dm 2019-05-16 15:44:59 -04:00
Fermi 246a344fed Mreac fixed, tongue health, pH vars+ (drink, food, pryo, tox remain) 2019-05-16 00:58:30 +01:00
Trilbyspaceclone 203906781c Cit change 2018-11-10 00:34:38 -05:00
Trilbyspaceclone 09752d4e2b Coin for headset with Engi access 2018-11-03 18:46:59 -04:00
deathride58 b1688405d9 and finally, the modules folder. Now I can publish and take a break 2018-07-02 01:19:37 -04:00
deathride58 2f9e3e403d Hard upstream sync (#6951)
* maps - none of our changes included yet i'll get them in after i finish up the rest of the sync

* sync part 1 - underscore folders in code

* controllers folder

* datums folder

* game folder

* cmon, work

* modules - admin to awaymissions

* cargo to events

* fields to lighting

* mapping > ruins

* rest of the code folder

* rest of the folders in the root directory

* DME

* fixes compiling errors. it compiles so it works

* readds map changes

* fixes dogborg module select

* fixes typo in moduleselect_alternate_icon filepath
2018-05-31 16:03:18 -07:00