Commit Graph

14595 Commits

Author SHA1 Message Date
kevinz000 3625d88b47 fixes 2020-04-25 03:41:15 -07:00
kevinz000 866b3789ab ok 2020-04-25 01:54:26 -07:00
kevinz000 ec4a40fa37 ok 2020-04-25 01:05:12 -07:00
kevinz000 e6b0fb4929 this was a mistake 2020-04-25 01:02:47 -07:00
kevinz000 6c5d42b5f5 oh boy 2020-04-25 00:48:56 -07:00
kevinz000 cbe2daea94 Update callproc.dm 2020-04-24 23:52:49 -07:00
kevinz000 abb7f199df tweaks 2020-04-24 23:39:08 -07:00
kevinz000 62fd71c50e kay 2020-04-24 23:31:34 -07:00
kevinz000 07dedea81a Merge remote-tracking branch 'citadel/master' into typing_indicators 2020-04-24 22:49:54 -07:00
Lin 25c9653540 Merge pull request #11966 from NopemanMcHalt/digi-justice
Fixes cosmetic tactifool sprite not using digitigrade sprites
2020-04-25 03:31:04 +00:00
kappa-sama 1f5c66651a costs 2020-04-24 21:02:58 -04:00
Ghommie 0c1c879fb4 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit697 2020-04-25 02:49:59 +02:00
Ghom 5ccdc55e42 Merge pull request #11979 from kevinz000/magnetic_harness
Cybernetic arm implant balance pass (namely: shields)
2020-04-25 02:47:28 +02:00
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