Commit Graph

14288 Commits

Author SHA1 Message Date
kevinz000
a533906f73 Merge pull request #11992 from Ghommie/Ghommie-cit703
reagents value nerf and standardization.
2020-04-25 16:54:14 -07:00
kevinz000
da61b04ed0 Merge pull request #11997 from Ghommie/Ghommie-cit705
code for designs' security level requirements.
2020-04-25 16:53:48 -07:00
kevinz000
d041df458c Merge pull request #11998 from Ghommie/Ghommie-cit706
Still unimplemented security level firing pins.
2020-04-25 16:53:39 -07:00
kevinz000
7d688126c8 Merge pull request #12008 from Ghommie/Ghommie-cit707
VR Levels are not a subset of Away Missions anymore.
2020-04-25 16:51:52 -07:00
kevinz000
fb1c4c215f Merge pull request #12009 from Ghommie/Ghommie-cit708
Fixing empty new lines on IC assemblies examine.
2020-04-25 16:51:36 -07:00
kevinz000
0bf1f1e34f Merge pull request #12010 from Ghommie/Ghommie-cit709
Porting some VV updates from tg.
2020-04-25 16:51:27 -07:00
kevinz000
4689e2aeb6 Merge pull request #11980 from Ghommie/Ghommie-cit700
Movespeed modifiers refactor port.
2020-04-25 16:51:14 -07:00
Lin
4d596ddff6 Merge pull request #12007 from Citadel-Station-13/Ghommie-patch-1
Fixing robo limb burn damage being unfixable.
2020-04-25 18:37:35 +00:00
Lin
499e71c528 Merge pull request #11993 from Ghommie/Ghommie-cit704
porting CEV-Eris pickweight procs.
2020-04-25 18:30:26 +00:00
kevinz000
cbe2daea94 Update callproc.dm 2020-04-24 23:52:49 -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
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
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
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
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
Ghommie
0beb28d3bb reagents value nerf and standardization. 2020-04-23 19:52:22 +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
c8b3032087 Merge branch 'master' into cube-world 2020-04-23 02:04:56 -04: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
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
Ghommie
42201343a9 Backward 512 compatibility removal. 2020-04-23 00:59:23 +02: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
Ghom
0c15c09e48 Update _box_magazine.dm 2020-04-22 16:30:30 +02:00
Seris02
39199a3a79 there 2020-04-22 12:31:55 +08:00
Ghom
6467cc9647 Merge pull request #11958 from Putnam3145/ling-kill-once
Makes ling kill objectives kill-once
2020-04-22 04:05:06 +02:00
Ghom
aab62f196d Merge pull request #11954 from Trilbyspaceclone/patch-350
Makes medical hardsuits a smig faster
2020-04-22 03:32:07 +02:00