shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
27,831 Commits 5 Branches 0 Tags
07a5f052d36bdc33ccef0f5ef4141d94d280c5fb
Commit Graph

11491 Commits

Author SHA1 Message Date
Ghommie
a650e1e411 Ports "Renames is_hot and is_sharp to get_temperature and get_sharpness" 2019-11-05 05:37:28 +01:00
kevinz000
b9ee75bd3f Update _production.dm 2019-11-04 20:03:40 -07:00
Trilbyspaceclone
09cd439f85 so dumb that github suggestions brake " 2019-11-04 17:24:37 -05:00
Ghommie
4ab3512dda Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit281 2019-11-04 23:15:12 +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
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
29daa0c908 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit290 2019-11-04 22:59:24 +01: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
fe87eec45c i hate mob code 2019-11-04 00:58:51 -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
Trilbyspaceclone
8a9e0dbbe3 pen b gone 2019-11-03 20:49:03 -05: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
TrilbySpaceClone
82b148b7b7 Merge branch 'master' into Cargo_MKII 2019-11-03 17:53:06 -05:00
TrilbySpaceClone
40a47bb4e9 Merge branch 'Cargo_MKII' of https://github.com/Trilbyspaceclone/Citadel-Station-13 into Cargo_MKII 2019-11-03 17:26:38 -05:00
TrilbySpaceClone
bd4501e11c the last touches? 2019-11-03 17:26:28 -05:00
Trilbyspaceclone
3ab70cbc26 Update sheets.dm 2019-11-03 13:04:48 -05:00
Trilbyspaceclone
50b4e76764 Update bottle.dm 2019-11-03 12:58:31 -05:00
TrilbySpaceClone
a8248c68f4 perhaps 2019-11-03 12:53:02 -05:00
Ghommie
543df8822e .len 2019-11-03 18:17:34 +01:00
Ghommie
efbcce023a Oh yea it won't work otherwise. 2019-11-03 18:16:19 +01:00
Ghommie
431ab8fc0b better be safe than sorry. 2019-11-03 17:56:30 +01:00
Ghommie
4b667743b9 Regenerating limbs won't no longer gib dullahans. 2019-11-03 17:50:03 +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
Trilbyspaceclone
4fa6c4d5c0 Apply suggestions from code review 
Co-Authored-By: dapnee <33661984+dapnee@users.noreply.github.com>
 2019-11-03 11:10:30 -05:00
TrilbySpaceClone
5c4cd15762 Hmm 2019-11-03 11:05:45 -05:00
Ghommie
ab4c69486d It works. 2019-11-03 16:04:28 +01:00
kevinz000
c4423004a1 Update medbot.dm 2019-11-03 06:51:16 -08:00
Ghommie
3cf056ed93 Also fixing jacqueen... wrong tools.dmi 2019-11-03 15:26:16 +01:00
Ghommie
7bd905e6b2 Mistakes were made. 2019-11-03 15:13:18 +01:00
kevinz000
65f9ad49bb Update medbot.dm 2019-11-03 05:39:11 -08: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
02935c062d Fixing more issues. 2019-11-03 05:37:10 +01:00
Ghommie
7e4aef46d9 Unmodularize and update pAI/Intellicards very slighty. 2019-11-03 04:23:31 +01:00
kappa-sama
3e95a66513 Update energy_gun.dm 2019-11-02 23:04:06 -04:00
Ghommie
20bafdd855 Unmodularize phantom thief glasses, missing durathread headwear sprites and space-nam clothing. 2019-11-03 03:23:59 +01:00
Ghommie
592d1a4b54 Unmodularize cargo console, disposal bin, lighting bulbs/tubes and alien nest ruin. 2019-11-03 01:55:59 +01:00
Ghommie
401f21d746 Fixing broken fixes. Testing. 2019-11-03 01:19:45 +01:00
Ghommie
2653a2965d How about we only check the living? 2019-11-02 20:46:33 +01:00