Commit Graph

809 Commits

Author SHA1 Message Date
kevinz000
9f3aa6de13 Merge pull request #8316 from Trilbyspaceclone/Lock_and_key
Better Locked Collar checks
2019-05-11 22:21:16 -07:00
kevinz000
9b135ed56b Merge pull request #8338 from Sishen1542/satchel-holding
Satchel of Holding!
2019-05-11 22:14:15 -07:00
Trilbyspaceclone
1f1926a70e Create machine_designs_all_misc.dm 2019-05-11 12:26:56 -04:00
Trilbyspaceclone
f47c0786f3 Add files via upload 2019-05-11 11:42:31 -04:00
Trilbyspaceclone
172d56ace5 Add files via upload 2019-05-11 11:41:56 -04:00
Trilbyspaceclone
3a12bab370 Delete machine_designs.dm 2019-05-11 11:41:20 -04:00
Trilbyspaceclone
034a9a0865 Delete comp_board_designs.dm 2019-05-11 11:41:10 -04:00
Trilbyspaceclone
af7b7fc638 Update autolathe_designs_medical_and_dinnerware.dm 2019-05-10 16:48:52 -04:00
Trilbyspaceclone
2885330459 commit die 2019-05-10 16:30:39 -04:00
Trilbyspaceclone
a703b8b85f Yep this works 100% no errors at all! 2019-05-10 16:30:01 -04:00
Sishen
c3df1b354e Satchel of holding
fashion creep
2019-05-09 20:44:07 -04:00
kevinz000
a7192734dd Merge pull request #8323 from Trilbyspaceclone/inducer
Makes a new COMBAT inducer! - Admin only
2019-05-08 01:34:33 -07:00
Trilbyspaceclone
9adeccc5e1 Update autolathe_designs.dm 2019-05-06 23:47:39 -04:00
Trilbyspaceclone
ae75bf2fd1 Update autolathe_designs.dm 2019-05-06 23:46:31 -04:00
deathride58
9d6f85d555 Merge pull request #8292 from Citadel-Station-13/kevinz000-patch-47
adds message monitor to telecomms technode
2019-05-06 22:04:12 -04:00
Trilbyspaceclone
9aa74f4fc2 Update all_nodes.dm 2019-05-06 19:58:45 -04:00
Trilbyspaceclone
5e5c470dc9 Update all_nodes.dm 2019-05-05 06:51:10 -04:00
Trilbyspaceclone
cc34a8fa4e Update all_nodes.dm 2019-05-05 06:47:03 -04:00
Trilbyspaceclone
5904d1d281 Update power_designs.dm 2019-05-05 06:45:40 -04:00
Ghommie
f13e48b014 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit11 2019-05-04 19:39:41 +02:00
Trilbyspaceclone
29a4750e21 Update autolathe_designs.dm 2019-05-01 18:38:40 -04:00
Trilbyspaceclone
831e450b3f Update weapon_designs.dm 2019-05-01 16:08:17 -04:00
kevinz000
cbc0607086 Merge pull request #8290 from Trilbyspaceclone/Laser_gun_adv
Readds Laser carbines.
2019-04-30 05:31:33 -07:00
Trilbyspaceclone
32b2342e4a ouch! 2019-04-27 18:48:47 -04:00
Trilbyspaceclone
080488ed61 Update misc_designs.dm 2019-04-26 22:32:06 -04:00
Trilbyspaceclone
192b3ebc6c >_< WOOPS 2019-04-26 22:25:48 -04:00
Trilbyspaceclone
6b0e533b69 Update smelting_designs.dm 2019-04-26 22:20:42 -04:00
Trilbyspaceclone
28403a55f4 Update misc_designs.dm 2019-04-26 22:18:29 -04:00
Trilbyspaceclone
d2b45df30f Update medical_designs.dm 2019-04-26 22:16:35 -04:00
Trilbyspaceclone
2facc84975 Update machine_designs.dm 2019-04-26 22:14:32 -04:00
Trilbyspaceclone
f9157dea10 Update comp_board_designs.dm 2019-04-26 22:12:56 -04:00
kevinz000
da11e400b9 Update all_nodes.dm 2019-04-26 03:18:45 -07:00
Trilbyspaceclone
fdbaafa5a9 Update weapon_designs.dm 2019-04-26 00:45:17 -04:00
Trilbyspaceclone
c033210577 Update all_nodes.dm 2019-04-26 00:43:37 -04:00
Trilbyspaceclone
ebc3347850 Update misc_designs.dm 2019-04-23 12:16:07 -04:00
Trilbyspaceclone
875bd522d0 grammer 2019-04-15 22:45:08 -04:00
Trilbyspaceclone
84b04d8752 Update misc_designs.dm 2019-04-14 23:22:17 -04:00
Trilbyspaceclone
1a0aca6a65 Update comp_board_designs.dm 2019-04-14 23:20:49 -04:00
Trilbyspaceclone
cc06df001a Update all_nodes.dm 2019-04-14 23:20:09 -04:00
deathride58
41375d9737 Increases performance significantly by turning garbage collection into a define 2019-04-14 11:33:28 -04:00
deathride58
2c9deab42e removes add_gas() and assert_gas(). next up: do further testing with garbage_collect() present and not present 2019-04-14 10:33:39 -04:00
deathride58
8b75240d89 fuck atmos - attempts to optimize atmos by removing GAS_META from the gas mixture meta list and removing the usage of gas archive 2019-04-11 17:07:11 -04:00
Ghommie
f220f1cb12 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit11 2019-04-10 16:05:22 +02:00
Trilbyspaceclone
94f97ba58d Update all_nodes.dm 2019-04-06 15:15:55 -04:00
kevinz000
997e975e1d Merge pull request #8170 from Trilbyspaceclone/Borgo
Maybe adds adv health scanner to all borgs that have health scanners
2019-04-02 05:37:22 -07:00
kevinz000
ebdd1ecce5 Merge pull request #8173 from Trilbyspaceclone/2.0Defibs
Defib upgrade tech
2019-04-02 05:35:04 -07:00
Seris02
c91fd98fb0 adds bluespace bio bags 2019-03-31 15:13:01 +08:00
Trilbyspaceclone
8bebae82f5 Update all_nodes.dm 2019-03-26 13:08:09 -04:00
Trilbyspaceclone
726ace52eb merg conflict is this 2019-03-26 12:59:39 -04:00
Trilbyspaceclone
8752fd56da Update all_nodes.dm 2019-03-25 16:39:47 -04:00