shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
27,049 Commits 5 Branches 0 Tags
3524bc24eaeda23f2ba59ea2aaba6885e305ee21
Commit Graph

17225 Commits

Author SHA1 Message Date
Putnam
e3b901fd23 Makes malf AI its own ruleset in dynamic. 2019-11-05 23:45:59 -08:00
kevinz000
b6af62e994 Update kinetic_crusher.dm 2019-11-05 18:07:46 -07:00
BlackMajor
026f9758b9 Actually wait that's way simpler 2019-11-06 12:55:25 +13:00
BlackMajor
960de09a96 Oh there's even more 2019-11-06 12:49:50 +13:00
BlackMajor
9efddbe580 thank you dark souls 2019-11-06 12:47:21 +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
rosko
cc8423ac45 adds a lizzard plushie 
yet another player plushie....this one comes with a real fake maxcap
 2019-11-05 20:38:44 +02:00
Ghommie
ae9ff92d33 Fixes free real estate paraplegic trait and bolas. 2019-11-05 18:03:50 +01:00
Anonymous
0849ea365f Merge branch 'master' into assu 2019-11-05 15:45:04 +03:00
Winter Flare
4b6d9848ff Update assistant.dm 2019-11-05 01:44:15 -05:00
Winter Flare
74b5961a8d Removed an unneeded line, added gas masks 2019-11-05 01:43:38 -05:00
Ghommie
43014a8729 Riding component fix and hacky mood runtimes workaround. 2019-11-05 07:33:43 +01:00
Winter Flare
87695c0a21 Moved some stuff around, added some more. 
Moved Strange Objects and Sunglasses into silly.dm, modified a few of the bounty prices.
 2019-11-05 00:22:22 -05:00
Ghommie
98f5eb7265 Umodularize saycode and meat slabs. 2019-11-05 06:11:54 +01:00
kevinz000
f4fc3a5a1a Update beams.dm 2019-11-04 21:48:33 -07: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
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
Ghommie
1a2901f197 Ports CEV-Eris matchbox respriting, also respriting cigar boxes. 2019-11-04 16:14:12 +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
9af899c9c3 cleaning up 2019-11-03 12:59:41 -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