shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
27,807 Commits 5 Branches 0 Tags
4e528da5c283fa00367b809a3010268fee970dfe
Commit Graph

148 Commits

Author SHA1 Message Date
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
TrilbySpaceClone
32cbe8588e fogot the beest one 2019-12-15 01:15:55 -05:00
TrilbySpaceClone
5febc54fb8 whats all the buzz around this new drink? 2019-12-15 01:13:15 -05:00
Unknown
73abc2ae40 Merge branch 'master' into xantholne-christmas01 2019-12-14 17:15:00 -07:00
Ghommie
79328012b0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit402 2019-12-13 03:41:22 +01:00
TrilbySpaceClone
c4450579ac Why does breakfast have a timer? 
https://github.com/tgstation/tgstation/pull/44419
https://github.com/tgstation/tgstation/pull/46220
https://github.com/tgstation/tgstation/pull/44914
https://github.com/tgstation/tgstation/pull/46933
https://github.com/tgstation/tgstation/pull/48153
https://github.com/tgstation/tgstation/pull/46898
 2019-12-07 01:53:55 -05:00
Unknown
97e686cf23 Merge branch 'master' into xantholne-christmas01 2019-12-06 17:21:08 -07:00
Putnam3145
8d09f5a082 Merge branch 'master' into tinytweaks 2019-12-01 23:24:56 -08:00
Unknown
33854e8fd8 Adds a huge amount of Christmas clothes 2019-11-27 20:07:39 -07:00
Ghommie
4a3a7c841a Removes literally atrocious polka dotted accessories. 2019-11-28 03:54:38 +01: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
fb4a47d310 Added more items to vendors. 
-Added stuff to the following:
clothing vendor
chef utensil vendor
snack vendors
kinkmate
 2019-11-23 15:58:04 -05: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
kevinz000
178aedc5cc Merge pull request #9754 from Ghommie/Ghommie-cit330 
porting "global to static"
 2019-11-14 16:38:27 -07:00
Ghommie
e977ba6729 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit290 2019-11-10 23:17:58 +01:00
Ghommie
9591bb5471 porting "global to static" 2019-11-09 22:53:56 +01: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
Ghommie
a5b37b658b Purging a lot of space indention in favor of tabs. 2019-10-29 15:46:31 +01:00
TrilbySpaceClone
18c9283d4a Merge branch 'master' into A_Tailer's_art 2019-10-18 00:21:42 -04:00
Fermi
f587beeef4 2 hats and undoes halloween accidental change 2019-10-15 22:56:42 +01:00
Thalpy
1eccc93137 Oh it's so good 2019-10-15 10:44:35 +01:00
Thalpy
1b170fe2b7 Costume for meee 2019-10-15 10:27:31 +01:00
Trilbyspaceclone
f43bd91072 Merge branch 'master' into A_Tailer's_art 2019-10-05 11:50:12 -04:00
kevinz000
7c3036f027 Merge pull request #9267 from Tupinambis/EngineeringCriticalFix 
Gives the Endivend Upgraded RCDs by default, instead of Autolathe ones.
 2019-09-28 00:28:43 -07:00
TrilbySpaceClone
41fbb759b2 Merge branch 'master' into more_cooking2 2019-09-25 14:56:11 -04:00
kevinz000
c4f5ce67b8 Merge pull request #9276 from Trilbyspaceclone/war_on_fashen 
Adds clip on pokadoted pants, only in 4 types for now
 2019-09-13 10:43:00 -07:00
TrilbySpaceClone
fa868ce4ff fashen crime 2019-09-11 14:22:50 -04:00
Tupinambis
6bdc0ef0c0 gives engivend upgraded RCDs by default. 2019-09-09 21:12:28 -05:00
Linzolle
64b757f404 refactor suits 2019-09-07 17:10:10 -05:00
Trilbyspaceclone
a68f35723f Update clothesmate.dm 2019-09-05 06:45:22 -04:00
Trilbyspaceclone
b85ff2c5a2 Update nutrimax.dm 2019-09-05 06:44:59 -04:00
Trilbyspaceclone
57fd7388d3 Update nutrimax.dm 2019-09-05 06:44:37 -04:00