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

3223 Commits

Author SHA1 Message Date
kevinz000
92455b5b8c Merge pull request #9695 from Ghommie/Ghommie-cit311 
Unmodularize and update pAI/Intellicards very slighty.
 2019-11-10 11:40:14 -07:00
kevinz000
e8219dd9f7 Merge pull request #9697 from Poojawa/patch-1 
Better Health Analyzer formatting
 2019-11-10 11:35:07 -07:00
kevinz000
e0626d12b1 Merge pull request #9707 from BonniePandora/Weldhelmets 
Port Welding Hard Hats from /tg/
 2019-11-10 11:30:54 -07:00
kevinz000
487e1806e7 Merge pull request #9709 from Trilbyspaceclone/cargo_memes_3 
Adds 8 more sci crates to cargo
 2019-11-10 11:30:33 -07:00
kevinz000
501dfbb43a Merge pull request #9715 from Ghommie/Ghommie-cit316 
Ports CEV-Eris resprited matchbox, also respriting cigar boxes myself.
 2019-11-10 11:27:36 -07:00
kevinz000
c46b425402 Merge pull request #9719 from Ghommie/Ghommie-cit318 
Renames is_hot and is_sharp to get_temperature and get_sharpness, just like how ol tg did.
 2019-11-10 11:26:06 -07:00
Ghommie
892b66470b Fixing several minor runtimes. 2019-11-05 23:07:29 +01: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
1a2901f197 Ports CEV-Eris matchbox respriting, also respriting cigar boxes. 2019-11-04 16:14:12 +01:00
TrilbySpaceClone
526d9b203c aliens 
man
 2019-11-04 00:34:03 -05: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
6462d0c8c8 Merge pull request #9658 from Ghommie/Ghommie-cit291 
Fixing dogborg sleepers runtimes, how atrocious...
 2019-11-03 06:20:30 -07:00
kevinz000
0fa57f6102 Merge pull request #9660 from Ghommie/Ghommie-cit293 
Fixing riding component runtimes, how drifting...
 2019-11-03 06:19:56 -07:00
kevinz000
3a2ce8c5ce Merge pull request #9679 from Ghommie/Ghommie-cit302 
Ports "Replaces the rpg loot datum with a component and makes some suffixes have real effects" & co
 2019-11-03 06:14:13 -07:00
kevinz000
dcee360ac5 Merge pull request #9686 from Ghommie/Ghommie-cit304 
Fixing storage implant transplant.
 2019-11-03 06:11:20 -07:00
Poojawa
d8e0771dcd Better Health Analyzer formatting 
Because having it all bunched up is a pet peeve.
 2019-11-02 23:14:39 -05:00
Ghommie
7e4aef46d9 Unmodularize and update pAI/Intellicards very slighty. 2019-11-03 04:23:31 +01:00
Ghommie
91625b6e60 item/doMove() calling dropped() callign qdel(src) because of DROPDEL. 2019-11-02 14:15:31 +01:00
Ghommie
874cdfefb8 fixing storage implant transplant. 2019-11-02 14:03:14 +01:00
kevinz000
d9c38d0589 Merge pull request #8948 from Ghommie/Ghommie-cit156 
Cleaning up the arousal module.
 2019-10-31 17:27:03 -07: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
be752c1fb0 Merge pull request #9531 from Ghommie/Ghommie-cit246 
Little stunbaton nerf (split off from #9500)
 2019-10-29 21:43:45 -07:00
kevinz000
6dc6159f4a Merge pull request #9578 from deathride58/mapsubsystemimprovements 
Map config system improvements - Fixed and expanded map vote restrictions, map-specific announcer framework, and more
 2019-10-29 21:42:32 -07:00
kevinz000
a7039c2d89 Merge pull request #9500 from Ghommie/Ghommie-cit237 
teleprods works on non-carbons too now.
 2019-10-29 21:37:41 -07:00
kevinz000
b172c5f691 Merge pull request #9501 from deathride58/stronksecborgs 
Borg buffs - Allows jaws to incapacitate, gives secborg a taser, and more! (wall of text in desc)
 2019-10-29 21:29:12 -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
kevinz000
86aafd016b Merge pull request #9652 from Ghommie/Ghommie-cit289 
sofa sprites armrest improvements.
 2019-10-29 21:24:07 -07:00
kevinz000
2ca3cedaed Merge pull request #9648 from Ghommie/Ghommie-cit288 
Random plush spawner tweaks and fixes.
 2019-10-29 21:22:46 -07:00
kevinz000
0fb5687a0a Update RCD.dm 2019-10-29 16:53:15 -07:00
kevinz000
0746d782d7 Update RCD.dm 2019-10-29 16:43:59 -07:00
kevinz000
39030b8fb0 Update RCD.dm 2019-10-29 16:37:36 -07:00
Ghommie
30fb851abd damn 2019-10-30 00:09:29 +01:00
Ghommie
54f8c29005 Fixing riding component runtimes, how drifting... 2019-10-29 23:33:35 +01:00
Ghommie
6a64647ee8 Fixing dogborg sleepers runtimes, how atrocious... 2019-10-29 19:45:10 +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
f725afae64 Random plush spawner tweaks and fixes. 2019-10-29 02:06:22 +01:00
kevinz000
d7e8b5209f Update bags.dm 2019-10-27 20:36:32 -07: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
kevinz000
dabfba8a0d Merge pull request #9619 from BlackMajor/Yote 
Buffs engiborg build potential
 2019-10-27 05:38:50 -07:00
Ghommie
3b3a4f9af1 Updating a comment. 2019-10-26 15:06:02 +02:00
BlackMajor
1b2d1c1423 Whoops again 2019-10-27 02:04:46 +13:00
BlackMajor
90d28b7202 whoops 2019-10-26 23:00:12 +13:00
BlackMajor
f3cbd43d8b What if engiborgs could actually build machines 2019-10-26 22:58:28 +13: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
kevinz000
49e52eee05 Merge pull request #9603 from Ghommie/Ghommie-cit267 
Unmodularize lavaknights and emags.
 2019-10-25 20:12:35 -07:00
Ghommie
79c3700d25 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit156 2019-10-25 12:42:28 +02: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