Commit Graph

14466 Commits

Author SHA1 Message Date
Ghom c8c5073c35 Merge pull request #11981 from Hatterhat/10mm-doesnt-have-a-dot-in-front-idiot
10mm doesnt have a dot in the caliber name bro
2020-04-25 02:31:28 +02:00
Ghommie 0f654d9f0e Fixing dresses being invisible on digitigrades. 2020-04-25 02:23:13 +02:00
Putnam 95d1a25df7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into fix-story-storyteller 2020-04-24 16:07:38 -07:00
Ghommie e17c51a85d Porting some VV updates from tg. 2020-04-25 00:49:51 +02:00
Ghommie ca2d4ae28f Fixing empty new lines on circuit examines. 2020-04-24 23:44:07 +02:00
Ghommie a9be1e06e2 Fixing stuff, it now should be ready. 2020-04-24 23:00:31 +02:00
Ghommie 58fc679cce WIP 2020-04-24 20:49:15 +02:00
Ghom 89e5681593 Fixing robo limb burn damage being unfixable. 2020-04-24 18:33:54 +02:00
ZeroMan 883b932a48 i will eliminate security 2020-04-23 22:28:50 -04:00
Ghommie a97c2f66a5 Putnam's suggestions. 2020-04-24 03:44:12 +02:00
Ghommie b914f6f96d Still unimplemented security level firing pins. 2020-04-24 03:20:51 +02:00
Ghommie a62f3f0d92 Clarifies a comment. 2020-04-24 01:12:33 +02:00
Ghommie e0a51903a1 Not yet implemented design security level requirements. 2020-04-24 00:51:04 +02:00
Trilbyspaceclone 83ba5c1b9b Update venus_human_trap.dm 2020-04-23 16:52:24 -04:00
Ghommie de531bd047 porting CEV-Eris pickweight procs. 2020-04-23 21:47:54 +02:00
kevinz000 cf61795101 Merge pull request #11941 from kiwedespars/punch-bundle
re-adds north star gloves to traitors for 20 tc
2020-04-23 11:45:04 -07:00
kevinz000 6a5e286ed2 Merge pull request #11942 from Trilbyspaceclone/cube-world
Cube world, aka - More dehydrated cubes! Modular Cubes and more!
2020-04-23 11:44:48 -07:00
kevinz000 45319b4942 Merge pull request #11976 from Citadel-Station-13/Ghommie-patch-1
Updates ammo_box/update_icon() to nowadays standards.
2020-04-23 11:41:51 -07:00
kevinz000 1e515b89f9 Update mob_movement.dm 2020-04-23 11:33:10 -07:00
Ghommie 0beb28d3bb reagents value nerf and standardization. 2020-04-23 19:52:22 +02:00
DeltaFire 1a6f5eb131 If it compiles it works
Kidding, tested on local and it runs fine.
Adds nanite protocols to the techweb, without BEPIS, aswell as adding one more protocol onto the ones ported from /tg
2020-04-23 15:15:26 +02:00
Ghommie b5abfd9273 thank you dreamchecker. 2020-04-23 14:49:05 +02:00
Ghom e4c6df71fc Update tacklers.dm 2020-04-23 14:35:36 +02:00
TrilbySpaceClone 7761990919 soooo this complies but does it work? 2020-04-23 03:13:07 -04:00
TrilbySpaceClone 86abfefa1b still dosnt work 2020-04-23 02:52:07 -04:00
Trilbyspaceclone f1a5ba0754 wew 2020-04-23 02:28:16 -04:00
Trilbyspaceclone b0e8c90531 Update spacevine.dm 2020-04-23 02:19:04 -04:00
TrilbySpaceClone c8b3032087 Merge branch 'master' into cube-world 2020-04-23 02:04:56 -04:00
kevinz000 b398e65416 Update mob_movement.dm 2020-04-22 22:46:42 -07:00
kevinz000 c43f4e2e5e Update tacklers.dm 2020-04-22 22:27:48 -07:00
kevinz000 af222768fe Revert "Update tacklers.dm"
This reverts commit b6a47a06ed.
2020-04-22 22:27:17 -07:00
kevinz000 b6a47a06ed Update tacklers.dm 2020-04-22 22:26:39 -07:00
kevinz000 b29c211772 Update bodyparts.dm 2020-04-22 18:44:59 -07:00
kevinz000 1236e11eca Merge pull request #11950 from Citadel-Station-13/Ghommie-patch-3
Fixing a little mistake with a config.
2020-04-22 18:41:21 -07:00
Hatterhat 57eedfbe63 fastpumpers no longer lose stam from pumping 2020-04-22 18:33:16 -05:00
Ghommie 42201343a9 Backward 512 compatibility removal. 2020-04-23 00:59:23 +02:00
Hatterhat c686ed193b a book about mashing Z and LMB 2020-04-22 17:55:11 -05:00
Hatterhat 2126ca1674 dot on casing name gone 2020-04-22 15:41:22 -05:00
Lin 7f271157c3 Merge pull request #11929 from Ghommie/Ghommie-cit692
Shielded Component
2020-04-22 20:33:12 +00:00
Ghommie 63f5e101a2 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit700 2020-04-22 22:30:10 +02:00
Ghom 63362f74c9 Merge pull request #11912 from Seris02/betteruipref
toggle for tetris bags
2020-04-22 22:26:40 +02:00
Ghommie 63870cc9d1 Movespeed modifiers refactor port. 2020-04-22 22:01:39 +02:00
kevinz000 e4e2c0195c epic 2020-04-22 12:04:47 -07:00
kevinz000 c551006295 catch dropped 2020-04-22 10:54:42 -07:00
kevinz000 467497af54 woops 2020-04-22 10:45:13 -07:00
kevinz000 3e09ee8328 Alright 2020-04-22 10:42:11 -07:00
Lin df4452468a Merge pull request #11932 from Ghommie/Ghommie-cit695
Some mispelled filepaths.
2020-04-22 16:09:33 +00:00
Lin 20f2d5d961 Merge pull request #11964 from Citadel-Station-13/Ghommie-patch-2
Makes the human form ling power work again.
2020-04-22 16:07:49 +00:00
kevinz000 5c17902628 compile 2020-04-22 08:50:51 -07:00
kevinz000 5984fa02b8 more changes 2020-04-22 08:49:21 -07:00