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

10379 Commits

Author SHA1 Message Date
kevinz000
814321beeb Merge pull request #9696 from Ghommie/Ghommie-cit312 
clock welder overlay fix.
 2019-11-10 11:39:54 -07:00
kevinz000
d1f6483687 Merge pull request #9704 from Ghommie/Ghommie-cit314 
Minor ninja tweaks and stealth nerf.
 2019-11-10 11:31:25 -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
7b6604108f Merge pull request #9713 from Trilbyspaceclone/sprite-issues 
Makes catnip have sprites
 2019-11-10 11:28:49 -07:00
kevinz000
23cd6b7604 Merge pull request #9714 from Ghommie/Ghommie-cit315 
Fixing a few throw_at calls and modular computer processors Init.
 2019-11-10 11:28:26 -07:00
kevinz000
1493863533 Merge pull request #9716 from Ghommie/Ghommie-cit317 
Porting objective code refactor (ergo fixing abductors/abductees objective by updating the code)
 2019-11-10 11:27:04 -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
kevinz000
4fc10d436d Merge pull request #9721 from Ghommie/Ghommie-cit319 
Unmodularize secway and turfs
 2019-11-10 11:25:50 -07:00
kevinz000
3570df6084 Merge pull request #9726 from Ghommie/Ghommie-cit323 
Fixing several minor runtimes.
 2019-11-10 11:10:16 -07:00
BlackMajor
2c9af44ce3 Merge pull request #9724 from Ghommie/Ghommie-cit322 
Fixes free real estate paraplegic trait and bolas.
 2019-11-10 17:10:45 +13:00
BlackMajor
aaff0bf9e7 Merge pull request #9705 from kappa-sama/patch-4 
thanks major
 2019-11-08 14:17:59 +13:00
BlackMajor
a6bbe75c36 Merge pull request #9611 from Citadel-Station-13/supply-passive-gen 
Adds passive point generation to cargo. Nerfs miasma selling. Increases mindshield crate price.
 2019-11-08 14:17:17 +13:00
Ghommie
97dd0bd70c Yes. 2019-11-05 23:13:10 +01:00
Ghommie
892b66470b Fixing several minor runtimes. 2019-11-05 23:07:29 +01:00
Ghommie
ae9ff92d33 Fixes free real estate paraplegic trait and bolas. 2019-11-05 18:03:50 +01:00
Ghommie
9cac543a2b Unmodularize secway and turfs 2019-11-05 05:47:25 +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
Trilbyspaceclone
09cd439f85 so dumb that github suggestions brake " 2019-11-04 17:24:37 -05:00
Trilbyspaceclone
061579decb no fun allowed 2019-11-04 17:08:55 -05:00
Trilbyspaceclone
28b96494e6 huh 2019-11-04 17:03:00 -05:00
Ghommie
8c31c1036d Porting objective code refactor 2019-11-04 22:05:04 +01:00
Trilbyspaceclone
cb215be40d Apply suggestions from code review 
dap the hero

Co-Authored-By: dapnee <33661984+dapnee@users.noreply.github.com>
 2019-11-04 07:21:30 -05:00
TrilbySpaceClone
ae8b43e1c0 Update tea_coffee.dm 2019-11-04 06:05:10 -05: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
kappa-sama
9f04cba7bf workaround 2019-11-03 18:27:47 -05:00
Ghommie
dcc81d92b5 Fixing a few throw_at calls and modular computer processors Init. 2019-11-04 00:12:41 +01:00
Ghommie
431ab8fc0b better be safe than sorry. 2019-11-03 17:56:30 +01:00
Ghommie
76294cf162 oh flak. 2019-11-03 17:29:53 +01:00
Ghommie
286b78c84c Minor ninja tweaks and stealth nerf. 2019-11-03 17:14:55 +01:00
Ghommie
3cf056ed93 Also fixing jacqueen... wrong tools.dmi 2019-11-03 15:26:16 +01:00
kevinz000
2cdbf04272 Merge pull request #9687 from Ghommie/Ghommie-cit305 
Refactoring how Jacqueen teleportation destination is selected.
 2019-11-03 06:24:53 -07:00
kevinz000
5e9c1901b4 Merge pull request #9659 from Ghommie/Ghommie-cit292 
Fixing deep space gorilla runtimes, how ape...
 2019-11-03 06:20:06 -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
5bfcc663f5 Merge pull request #9662 from Ghommie/Ghommie-cit294 
Fixes some average runtimes, how null...
 2019-11-03 06:19:40 -07:00
kevinz000
0615189629 Merge pull request #9665 from Ghommie/Ghommie-cit295 
Removing references to national socialism
 2019-11-03 06:18:47 -07:00
kevinz000
c484a209a7 Merge pull request #9669 from Ghommie/Ghommie-cit297 
modkit uninstall() calling forceMove() calling loc.Exited() calling modkit uninstall()
 2019-11-03 06:17:21 -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
Ghommie
2653a2965d How about we only check the living? 2019-11-02 20:46:33 +01:00
Ghommie
f4587b4260 This is very unprofessional. Yet I'm no google architect. 2019-11-02 16:47:25 +01:00
Ghommie
50fc1004ba Actually holopads, so they won't end up in maintenance... 2019-11-02 16:46:02 +01:00
Ghommie
3193e3ce20 fix. 2019-11-02 16:12:37 +01:00
Ghommie
a949f84557 missing bits. 2019-11-02 16:00:48 +01:00
Ghommie
1bf10c0435 Improving Jacqueen's teleportation area selection. 2019-11-02 15:50:54 +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
Ghommie
b86c5059d5 [s] modkit uninstall() calling forceMove() calling loc.Exited() calling modkit.uninstall() calling f... 2019-10-30 13:17:12 +01: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
fb936a5319 Merge pull request #9598 from deathride58/runtimefixpass 
various runtime fixes - plasmaman tongues no longer have a maxHealth of "alien" and more
 2019-10-29 21:41:11 -07:00