shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
25,464 Commits 5 Branches 0 Tags
b8137cde6509dabc0efbbb4b61fc45d06cf86e77
Commit Graph

788 Commits

Author SHA1 Message Date
kevinz000
e0626d12b1 Merge pull request #9707 from BonniePandora/Weldhelmets 
Port Welding Hard Hats from /tg/
 2019-11-10 11:30:54 -07:00
Ghommie
a650e1e411 Ports "Renames is_hot and is_sharp to get_temperature and get_sharpness" 2019-11-05 05:37:28 +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
b653595702 Ports "Replaces the rpg loot datum with a component and makes some suffixes have real effects" & co 2019-10-31 22:40:11 +01: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
30fb851abd damn 2019-10-30 00:09:29 +01:00
Ghommie
85ba7943db Less visual issues. 2019-10-29 04:58:24 +01:00
Ghommie
9d17e63314 sofa sprites armrest improvements. 2019-10-29 04:53:24 +01: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
880b4039e7 Merge pull request #9622 from Ghommie/Ghommie-cit275 
Tweaking the Cyber Sylph's barsign.
 2019-10-27 16:10:08 -07:00
Ghommie
3b3a4f9af1 Updating a comment. 2019-10-26 15:06:02 +02:00
nik707
187ea6476b Merge pull request #9572 from Citadel-Station-13/canReachInto_1 
Fixes a bunch of CanReach/storage related bugs ("You can no longer stick your hands inside other people and take their things")
 2019-10-25 22:16:02 -05:00
Ghommie
ad7101d0aa ports anti-magic component code updates (holymelon not included). 2019-10-25 03:20:42 +02:00
kevinz000
2426849d4b this is a pretty bad idea 2019-10-22 02:19:33 -07:00
Poojawa
7e27c46c78 Fuck components 2019-10-22 00:33:58 -05:00
Poojawa
7463bbc001 Merge branch 'master' into syntheticbloods 2019-10-21 21:06:18 -05:00
deathride58
2742c86723 Merge pull request #9072 from Poojawa/gen-poppers 
Genpop for security
 2019-10-21 21:15:01 -04:00
Poojawa
ffeae20daa Merge remote-tracking branch 'Citadel-Station-13/master' into syntheticbloods 2019-10-18 06:01:52 -05:00
kevinz000
a6acb212fa Merge pull request #9515 from Ghommie/Ghommie-cit241 
Porting "Moves machine/computer frames and structures below object layer." and lowering trays layer.
 2019-10-17 17:29:18 -07:00
kevinz000
d9cb2792e5 Merge pull request #9516 from Ghommie/Ghommie-cit242 
Ports "Fixes morgues being able to consume ghosts, AI-eyes, etc."
 2019-10-17 13:04:15 -07:00
Poojawa
66c8c17bbd Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-17 05:45:06 -05:00
Ghommie
57794421e3 Ports "Fixes morgues being able to consume ghosts, AI-eyes, etc." 2019-10-16 23:57:31 +02:00
Ghommie
f3a9cac11e Porting "Moves machine/computer frames and structures below object layer." and lowering trays layer. 2019-10-16 23:39:21 +02:00
kevinz000
994bfddc1b Merge pull request #9477 from Thalpy/tgOrganFixes 
[READY] Fixes a few organ code and lets organs freeze based on ambient temperature.
 2019-10-16 12:44:34 -07:00
Poojawa
184e81eec0 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-16 01:51:51 -05:00
Fermi
7b2c8e58ff Fixes freezing and ghost rider 2019-10-14 13:23:39 +01:00
Ghommie
e969e89ce5 Well, byond quirks. 2019-10-14 03:09:15 +02:00
Ghommie
22fc7a9088 Resprites bedsheet bins in 3/4 perspective, adds towel bins subtype. 2019-10-14 02:32:23 +02:00
Poojawa
394c947d14 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-11 23:10:45 -05:00
kevinz000
b56563fcfe Merge pull request #9374 from kappa-sama/walktime 
ashwalkers now have more messages telling them to not go on station
 2019-10-11 12:13:49 -07:00
Poojawa
d7ab97dffc does some of the television's demands 2019-10-08 04:02:20 -05:00
Poojawa
3113074bfb Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-08 02:55:32 -05:00
kevinz000
abef83f56e Merge pull request #9427 from Ghommie/Ghommie-cit219 
Skeleton and zombie tweaks/balance (featuring "makes halloween skeletons not the overpowered pirate ones")
 2019-10-08 00:34:33 -07:00
kevinz000
76ede7a473 Merge pull request #9406 from Poojawa/carpet-colors 
More Carpet colors and liquid carpet varients
 2019-10-07 23:39:52 -07:00
kevinz000
0073d99a22 Merge pull request #9309 from Thalpy/tg-Organ-port 
[READY][SUCCESSFULLY TESTMERGED] Ports TG's organ handling (with a few tweaks to make it fit).
 2019-10-07 23:29:19 -07:00
Ghommie
a1a3bbe99f Skeleton tweaks (featuring "makes halloween skeletons not the overpowered pirate ones") 2019-10-06 19:16:13 +02:00
Poojawa
9d2d84f53d Update table_frames.dm 2019-10-04 15:49:25 -05:00
Poojawa
6d9aa8de70 More carpet options and ways to get them 2019-10-03 22:54:10 -05:00
Poojawa
b589565398 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-03 15:05:26 -05:00
Ghommie
81fc0c1b32 more foolproofing. 2019-10-02 00:37:02 +02:00
Ghommie
e635a05d16 errors. 2019-10-01 23:43:38 +02:00
Ghommie
d2300765b2 adjacency checks. 2019-10-01 23:16:47 +02:00
Ghommie
cfcd325778 reworking the shoving people action. 2019-10-01 23:13:08 +02:00
Fermi
89f3a01bc0 Merge branch 'master' into tg-Organ-port 2019-10-01 06:17:58 +01:00
Poojawa
117e5a409d Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-01 00:05:44 -05:00
kappa-sama
c42d5b31a1 ok justin 2019-09-30 20:13:31 -04:00
kevinz000
0febc1977a Merge pull request #9191 from Linzolle/fireman 
Ports fireman carrying from /tg/
 2019-09-28 00:38:08 -07:00
Poojawa
f14272e445 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-09-27 23:30:05 -05:00
Poojawa
f57bdc39a2 I still fucking hate components. 2019-09-23 02:03:37 -05:00
Ghommie
33c3f0834e Prevents sofas being wielded and thus transformed into normal chairs. 2019-09-21 20:01:42 +02:00