shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
30,712 Commits 5 Branches 0 Tags
4c10c830bf94de5f41e8c06bca0de5a856ad46f4
Commit Graph

979 Commits

Author SHA1 Message Date
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 8db64df364 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into wintergalorefix 2019-11-16 16:54:27 +08:00
Seris02 e0e3c510d4 adds QM, CE, HoS, HoP, genetics, chemistry, viro, and RD winter coats 2019-11-16 15:31:20 +08:00
Lin 6aa6eaafe6 Merge branch 'master' into abductor-update 2019-11-15 23:24:51 +00:00
Ghommie c7a3652d0a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit277 2019-11-15 01:12:36 +01:00
kevinz000 9b56aa0cae Merge pull request #9781 from Hatterhat/northstar-fast-intents 
northstar works on all intents, is slightly better than help intenting people with the hugs hands
 2019-11-14 16:18:31 -07:00
kevinz000 d1ea2d9990 Merge pull request #9554 from NopemanMcHalt/assu 
[READY] Desperate Assistance Battleforce
 2019-11-14 15:43:51 -07:00
Ghommie baedb7e091 I'm unprofessional. 2019-11-14 15:16:06 +01:00
Ghommie 7603db2e8b Bad habit of pushing things before the compile. 2019-11-14 15:10:32 +01:00
Ghommie 358db4f390 Dreamchecker compatibility changes, part 2. 2019-11-14 14:54:12 +01:00
Anonymous 837052740a Merge branch 'master' into assu 
# Conflicts Resolved:
#	icons/mob/head.dmi
#	icons/obj/clothing/hats.dmi
 2019-11-13 11:59:53 +03:00
Hatterhat 8d2f833735 stamina hands 2019-11-11 19:14:12 -06:00
Hatterhat d27150331a fast hands 2019-11-11 18:59:31 -06:00
Lin df051186eb Merge branch 'master' into abductor-update 2019-11-11 00:08:59 +00:00
Ghommie 449f9f03c3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit310 2019-11-10 21:20:24 +01:00
Ghommie 1e49ce76d3 Dreamchecker compatibility changes, part 1. 2019-11-10 20:48:30 +01:00
kevinz000 e0626d12b1 Merge pull request #9707 from BonniePandora/Weldhelmets 
Port Welding Hard Hats from /tg/
 2019-11-10 11:30:54 -07:00
Anonymous 0849ea365f Merge branch 'master' into assu 2019-11-05 15:45:04 +03:00
Ghommie a650e1e411 Ports "Renames is_hot and is_sharp to get_temperature and get_sharpness" 2019-11-05 05:37:28 +01:00
Ghommie b7364a1e8a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit277 2019-11-04 23:10:54 +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
kevinz000 0615189629 Merge pull request #9665 from Ghommie/Ghommie-cit295 
Removing references to national socialism
 2019-11-03 06:18:47 -07:00
Ghommie 20bafdd855 Unmodularize phantom thief glasses, missing durathread headwear sprites and space-nam clothing. 2019-11-03 03:23:59 +01:00
Ghommie 986c4e11c0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit245 2019-11-02 02:32:23 +01:00
Anonymous 5930389cb6 Merge branch 'master' into assu 2019-10-30 15:18:39 +03:00
Linzolle 266f1ff958 Merge remote-tracking branch 'upstream/master' into abductor-update 2019-10-29 23:58:01 -05:00
kevinz000 5aee9b0142 Merge pull request #9494 from Ghommie/Ghommie-cit235 
Fixes the "gear" harness.
 2019-10-29 21:37:11 -07:00
kevinz000 ae4aee794e Merge pull request #9592 from Ghommie/Ghommie-cit262 
Porting movespeed modification system updates.
 2019-10-29 21:27:53 -07:00
kevinz000 0064529362 Merge pull request #9610 from Ghommie/Ghommie-cit273 
ports anti-magic component code updates (holymelon sold separately).
 2019-10-29 21:26:03 -07:00
Ghommie 005c87bdf6 I'm making a joke title, don't ban me github. 2019-10-30 01:31:29 +01:00
Anonymous 23202e8524 Merge branch 'master' into assu 2019-10-29 17:53:16 +03:00
BlackMajor ba9c99644d Merge pull request #9640 from Linzolle/hat-toss 
I broke hats oops
 2019-10-29 10:00:52 +13:00
Anonymous ad00e6b36a Merge branch 'master' into assu 2019-10-28 19:02:48 +03:00
kevinz000 329f86cea0 Merge pull request #9612 from Linzolle/blood-overlay-again 
fix blood overlays again
 2019-10-27 17:21:55 -07:00
Linzolle 24e5905c38 fuck 2019-10-27 19:02:26 -05:00
Ghommie 80cd4902ca Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit273 2019-10-28 00:49:22 +01:00
kevinz000 d67b7f620d Merge pull request #9613 from Linzolle/hat-toss 
Port hat tossing
 2019-10-27 16:08:00 -07:00
Linzolle bdd553d4f7 thanks ghom 2019-10-27 17:26:55 -05:00
Anonymous 203509b405 Poll said its DAB 2019-10-27 16:27:03 +03:00
Ghommie 639555c017 Removes useless else if clause checks. 2019-10-26 17:37:45 +02:00
Ghommie c9ce5e4efe Unmodularize digi/muzzled clothing sprites. 2019-10-26 17:09:45 +02:00
Anonymous 11ff7802bb Merge branch 'master' into assu 
# Conflicts Resolved:
#	icons/mob/head.dmi
#	icons/mob/suit.dmi
#	icons/obj/clothing/hats.dmi
#	icons/obj/clothing/suits.dmi
 2019-10-26 18:06:56 +03:00
kevinz000 49e52eee05 Merge pull request #9603 from Ghommie/Ghommie-cit267 
Unmodularize lavaknights and emags.
 2019-10-25 20:12:35 -07:00
Linzolle 5bafab9447 missing period 2019-10-25 16:34:32 -05:00
MMMiracles 8fb0a68feb Adds Hat Throwing (#45355) 
* adds hat throwing on people and borgs

* clothing flags, hats can knock off non-items, borg hat blacklist check

* prevents hats with items in them from being able to land on heads

* removes extra equip, hats can go on the hatless again, tinfoil fix

* if

* bit flag
 2019-10-25 16:19:19 -05:00
Linzolle 9e89e898ee not again 2019-10-25 15:58:10 -05:00
Ghommie cb74be29ae Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit262 2019-10-25 12:40:50 +02:00
Anonymous dcb4c6ae04 Merge branch 'master' into assu 
...and its still coming together...
 2019-10-25 10:31:07 +03:00
kevinz000 da502aa31d Merge pull request #9535 from Ghommie/Ghommie-cit247 
Fixing sniper rifles scope datum action oddity.
 2019-10-24 19:05:25 -07:00