Commit Graph
33405 Commits
Author SHA1 Message Date
kevinz000andGitHub da61b04ed0 Merge pull request #11997 from Ghommie/Ghommie-cit705
code for designs' security level requirements.
2020-04-25 16:53:48 -07:00
kevinz000andGitHub d041df458c Merge pull request #11998 from Ghommie/Ghommie-cit706
Still unimplemented security level firing pins.
2020-04-25 16:53:39 -07:00
kevinz000andGitHub 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
kevinz000andGitHub 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
kevinz000andGitHub 0bf1f1e34f Merge pull request #12010 from Ghommie/Ghommie-cit709
Porting some VV updates from tg.
2020-04-25 16:51:27 -07:00
kevinz000andGitHub 4689e2aeb6 Merge pull request #11980 from Ghommie/Ghommie-cit700
Movespeed modifiers refactor port.
2020-04-25 16:51:14 -07:00
LinandGitHub 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
LinandGitHub 499e71c528 Merge pull request #11993 from Ghommie/Ghommie-cit704
porting CEV-Eris pickweight procs.
2020-04-25 18:30:26 +00:00
GhomandGitHub 24971060bd Merge pull request #12016 from Citadel-Station-13/kevinz000-patch-1
fixes global proccall
2020-04-25 15:52:06 +02:00
kevinz000andGitHub cbe2daea94 Update callproc.dm 2020-04-24 23:52:49 -07:00
LinandGitHub 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
LinandGitHub f745c59fad Merge pull request #11968 from MrJWhit/TEG-heat-go-away
teg map hot no hot room plz
2020-04-25 03:28:00 +00:00
GhomandGitHub 283440e8eb Merge pull request #11848 from Putnam3145/experimental-major-optimization
Removing SS_TICKER from the lighting subsystem
2020-04-25 03:08:27 +02:00
GhomandGitHub 21619b1ee3 Merge pull request #11925 from Trilbyspaceclone/patch-347
The Pr that nerfs crayon eating
2020-04-25 02:54:40 +02:00
GhomandGitHub 7b877eb9e0 Merge pull request #11832 from Seris02/storagewhitelist
adds extra functionality to storage whitelists
2020-04-25 02:50:56 +02:00
GhomandGitHub 5ccdc55e42 Merge pull request #11979 from kevinz000/magnetic_harness
Cybernetic arm implant balance pass (namely: shields)
2020-04-25 02:47:28 +02:00
GhomandGitHub f01cb896e5 Apply suggestions from code review 2020-04-25 02:43:56 +02:00
GhomandGitHub 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 2ff75d8c99 commenting lines. 2020-04-24 23:20:05 +02:00
Ghommie a9be1e06e2 Fixing stuff, it now should be ready. 2020-04-24 23:00:31 +02:00
GhomandGitHub a831b3b623 Merge pull request #11995 from MrJWhit/fixes-to-pubby-engine
Quick fixing up of pubbystation things
2020-04-24 21:29:32 +02:00
GhomandGitHub 8ee2ae4877 Merge pull request #11994 from MrJWhit/fix-to-delta-because-it-was-annoying-me
Adds a missing wire and a second SMES to the AI sat on Deltastation
2020-04-24 21:27:40 +02:00
Ghommie 58fc679cce WIP 2020-04-24 20:49:15 +02:00
GhomandGitHub 89e5681593 Fixing robo limb burn damage being unfixable. 2020-04-24 18:33:54 +02:00
Ghommie b914f6f96d Still unimplemented security level firing pins. 2020-04-24 03:20:51 +02:00
MrJWhit 100d7cffd2 Also fix that one maint door to be a maint door 2020-04-23 19:20:43 -04:00
Ghommie a62f3f0d92 Clarifies a comment. 2020-04-24 01:12:33 +02:00
Ghommie d1ec18a0ce what the?! 2020-04-24 00:57:40 +02:00
Ghommie e0a51903a1 Not yet implemented design security level requirements. 2020-04-24 00:51:04 +02:00
MrJWhit 037ea6e073 fixing up the engine 2020-04-23 18:26:39 -04:00
MrJWhit a621474ae7 Adds a missing wire and a second SMES to the AI sat 2020-04-23 18:10:56 -04:00
Ghommie de531bd047 porting CEV-Eris pickweight procs. 2020-04-23 21:47:54 +02:00
kevinz000andGitHub 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
kevinz000andGitHub 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
kevinz000andGitHub 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 b5abfd9273 thank you dreamchecker. 2020-04-23 14:49:05 +02:00
GhomandGitHub debbd3edab Merge pull request #11988 from Citadel-Station-13/kevinz000-patch-1
Fixes tackle gloves not removing their components
2020-04-23 14:35:49 +02:00
GhomandGitHub 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
kevinz000andGitHub 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
kevinz000andGitHub b6a47a06ed Update tacklers.dm 2020-04-22 22:26:39 -07:00
kevinz000andGitHub 529a8e52c7 Merge pull request #11960 from Trilbyspaceclone/patch-352
Theirs a snake in my boot...
2020-04-22 18:42:46 -07:00
kevinz000andGitHub 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
kevinz000andGitHub 411622430f Merge pull request #11985 from Ghommie/Ghommie-cit701
Removal of backward 512 compatibility.
2020-04-22 18:40:41 -07:00
GhomandGitHub 90b67455a6 Merge pull request #11983 from Trilbyspaceclone/patch-356
Fixes more shield icons
2020-04-23 01:01:15 +02:00
Ghommie 42201343a9 Backward 512 compatibility removal. 2020-04-23 00:59:23 +02:00
TrilbyspacecloneandGitHub 511465ed7b Update shields.dm 2020-04-22 18:13:09 -04:00