actioninja
|
abde27c098
|
layer changes
|
2020-03-28 23:50:08 -07:00 |
|
Putnam3145
|
5147536eb3
|
yeah whoops that should go (#11561)
|
2020-03-22 13:01:51 +01:00 |
|
kevinz000
|
e210f7d535
|
Merge pull request #11391 from Ghommie/Ghommie-cit612
Porting "Further update_icon splitup"
|
2020-03-10 05:58:17 -07:00 |
|
Ghommie
|
ee1eea8874
|
Ports "Switches out the three billion args of electrocute act for flags"
|
2020-03-09 04:01:23 +01:00 |
|
Ghommie
|
59b1a223a3
|
Ok, done.
|
2020-03-08 22:51:36 +01:00 |
|
kevinz000
|
9420424c8f
|
Merge pull request #11332 from Ghommie/Ghommie-cit603
Replaces EXCEPTION() with stack_trace() and CRASH()
|
2020-03-06 00:14:13 -07:00 |
|
Ghommie
|
bb7bfc04cc
|
Replaces EXCEPTION() with stack_trace() and CRASH()
|
2020-03-05 01:47:04 +01:00 |
|
kevinz000
|
1e99cd0bfe
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-03-03 03:08:41 -07:00 |
|
Ghom
|
00bc635d27
|
Merge pull request #11296 from Putnam3145/supermatter-hardcap
Proper supermatter tweaks
|
2020-03-02 16:36:58 +01:00 |
|
Putnam
|
aba8828fd4
|
Proper supermatter tweaks.
|
2020-03-01 14:20:15 -08:00 |
|
kevinz000
|
56eab760fc
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-27 20:11:36 -07:00 |
|
Artur
|
27b6469c67
|
Forgot a var
|
2020-02-26 16:42:38 +02:00 |
|
Artur
|
00403a39c6
|
Reverts tracker changes somewhat
|
2020-02-25 15:47:15 +02:00 |
|
Artur
|
f8469c89a4
|
Conflict fix
|
2020-02-25 10:46:20 +02:00 |
|
kevinz000
|
febb890c7f
|
Merge pull request #11192 from Putnam3145/supermatter-hardcap
Made supermatter power increase with raw damage
|
2020-02-24 15:12:45 -07:00 |
|
Artur
|
528a226dae
|
Done.
|
2020-02-24 13:36:55 +02:00 |
|
kevinz000
|
f6542b381c
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-21 23:29:25 -07:00 |
|
Ghommie
|
8fbfd07692
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229
|
2020-02-22 00:55:32 +01:00 |
|
kevinz000
|
a784a74ccb
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-21 13:35:26 -07:00 |
|
Putnam
|
0f9bda8f90
|
wow okay make it do this instead
|
2020-02-21 11:53:16 -08:00 |
|
Putnam
|
8e865a5081
|
Made power increase with raw damage.
|
2020-02-21 11:37:17 -08:00 |
|
Artur
|
e08c89ce48
|
Reverts some
|
2020-02-21 15:10:39 +02:00 |
|
Artur
|
5d76d33683
|
Merge remote-tracking branch 'Upstream/master' into Solar_updates
|
2020-02-20 13:15:46 +02:00 |
|
Ghom
|
e9d0f536de
|
Merge pull request #11146 from Putnam3145/supermatter-hardcap
Hardcaps supermatter damage from ballistics and similar
|
2020-02-20 11:08:14 +01:00 |
|
kevinz000
|
c7273c03be
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-19 19:12:27 -07:00 |
|
kevinz000
|
b983aa75ea
|
Merge pull request #11145 from Ghommie/Ghommie-cit586
Something about pAIs and silicon access priviledges.
|
2020-02-19 18:59:10 -07:00 |
|
kevinz000
|
0e4692c63d
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-18 18:16:34 -07:00 |
|
Putnam
|
2834994587
|
why didn't we do this sooner
|
2020-02-18 11:34:09 -08:00 |
|
Ghommie
|
698f0b8177
|
Something about pAIs and silicon access priviledges.
|
2020-02-18 16:20:44 +01:00 |
|
kevinz000
|
9280e25703
|
Merge pull request #11087 from Ghommie/Ghommie-cit579
Fix for solar panels/trackers being wonky.
|
2020-02-18 02:21:16 -07:00 |
|
Ghommie
|
1a0fba8a2a
|
Something about consistency and magnetic rifles.
|
2020-02-16 18:37:51 +01:00 |
|
Ghommie
|
e053721820
|
Fix for solar panels/trackers being wonky.
|
2020-02-14 07:15:13 +01:00 |
|
kevinz000
|
eca0e0f2dc
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-13 00:39:20 -07:00 |
|
Seris02
|
eb5835f668
|
fixes apcs
|
2020-02-12 21:35:51 +08:00 |
|
Seris02
|
0b1cb9db6d
|
timer'd
|
2020-02-08 15:25:11 +08:00 |
|
Artur
|
cf22596477
|
Reworks solars
|
2020-02-07 10:59:43 +02:00 |
|
Ghom
|
e7e13e99b8
|
Update apc.dm
|
2020-02-07 07:32:06 +01:00 |
|
Seris02
|
d0100345fd
|
done hopefully
|
2020-02-05 17:00:38 +08:00 |
|
Seris02
|
6cc6aa12be
|
yeehaw it's done
|
2020-02-05 16:54:57 +08:00 |
|
Ghommie
|
5dc1de1d04
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229
|
2020-02-05 04:34:54 +01:00 |
|
kevinz000
|
6a8a606f97
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-04 16:01:25 -07:00 |
|
kevinz000
|
275b1f73e0
|
Merge pull request #10849 from Ghommie/Ghommie-cit547
Removing a troublesome argument from organ/Remove() in favor or using the 'owner' variable
|
2020-02-04 03:39:14 -07:00 |
|
kevinz000
|
66fc2e77f0
|
Merge pull request #10865 from Ghommie/Ghommie-cit550
Demodularizes and nerfs magnetic rifles/pistols with power cell requirements.
|
2020-02-04 03:35:33 -07:00 |
|
Seris02
|
49f80d52a8
|
bug fixes
|
2020-02-04 17:18:45 +08:00 |
|
Ghommie
|
a726f09201
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229
|
2020-02-04 03:54:52 +01:00 |
|
Ghommie
|
a365f3b499
|
Demodularize and nerfs mag rifles with re(?)added power cell requirements.
|
2020-02-03 05:16:32 +01:00 |
|
kevinz000
|
c24c83c1bd
|
Merge pull request #10835 from Ghommie/Ghommie-cit546
Something about runtime errors.
|
2020-02-02 16:31:15 -07:00 |
|
Ghom
|
bb1f65813e
|
Merge pull request #10858 from Citadel-Station-13/kevinz000-patch-4
Fixes APC ui_data runtime
|
2020-02-02 18:06:44 +01:00 |
|
Artur
|
e7ddfdd8d8
|
Merge remote-tracking branch 'upstream/master' into TGUIs_Nexties
|
2020-02-02 13:31:54 +01:00 |
|
kevinz000
|
e0f967eaa2
|
Update apc.dm
|
2020-02-02 02:57:14 -07:00 |
|