 Ghommie
|
a194d7dafe
|
merge conflict and job/dept discounts support.
|
2020-05-03 02:11:05 +02:00 |
|
|
Ghommie
|
94f014589d
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685
|
2020-04-25 17:09:34 +02:00 |
|
|
Ghom
|
89e5681593
|
Fixing robo limb burn damage being unfixable.
|
2020-04-24 18:33:54 +02:00 |
|
|
Ghommie
|
42201343a9
|
Backward 512 compatibility removal.
|
2020-04-23 00:59:23 +02:00 |
|
|
Putnam
|
a9600cffaa
|
Replaces a xor with a power??
|
2020-04-21 13:01:50 -07:00 |
|
|
Ghommie
|
c93f028a97
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685
|
2020-04-21 01:53:41 +02:00 |
|
|
Ghom
|
6e62f7a2a3
|
Merge pull request #11878 from Arturlang/fixes_zipties_being_red
Makes zipties white again
|
2020-04-19 02:45:31 +02:00 |
|
|
Artur
|
bbd038bba6
|
Ghommies suggestion
|
2020-04-18 14:06:38 +03:00 |
|
|
Ghommie
|
87a6bd013c
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685
|
2020-04-17 21:57:21 +02:00 |
|
|
Ghommie
|
4c6f1b622b
|
Porting Goofconomy & co.
|
2020-04-17 07:48:11 +02:00 |
|
|
Artur
|
75dab9fa57
|
And some other fixes
|
2020-04-16 10:51:17 +03:00 |
|
|
Ghom
|
750acd7023
|
Update lighting.dm
|
2020-04-16 05:42:08 +02:00 |
|
|
kevinz000
|
1f900f0e9d
|
Merge pull request #11829 from Citadel-Station-13/Ghommie-patch-5
Fixing a whacky miniature cell duping issue.
|
2020-04-14 01:34:45 -07:00 |
|
|
Ghom
|
b00e97b848
|
Merge pull request #10732 from kevinz000/eldritch_affairs
Eldritch Affairs
|
2020-04-12 20:47:19 +02:00 |
|
|
Ghom
|
ab2d458947
|
Update lighting.dm
|
2020-04-12 07:12:54 +02:00 |
|
|
Putnam3145
|
474d6a486d
|
Merge pull request #11773 from Arturlang/cablefix
Fixes cablecuff making producing 0 amount cables
|
2020-04-09 01:28:30 -07:00 |
|
|
Artur
|
0a234d5618
|
TABS NOT SPACES
AAAAAAAA
|
2020-04-09 09:32:23 +03:00 |
|
|
Artur
|
75a2dd6900
|
Finnishing touches, hopefully
Tweaks some indendation
|
2020-04-08 18:32:45 +03:00 |
|
|
Artur
|
3cf6524389
|
Makes it nicer, removes check_cable_amount
Putnam suggested this as well
|
2020-04-08 18:28:35 +03:00 |
|
|
Arturlang
|
cdd2f55cac
|
Putnams suggestion
Makes use() a if, as to use it as a further sanity check
Co-Authored-By: Putnam3145 <putnam3145@gmail.com>
|
2020-04-08 18:24:14 +03:00 |
|
|
Artur
|
c9ab705c80
|
Ghommies suggestion
|
2020-04-07 16:08:38 +03:00 |
|
|
Artur
|
c4ff1cd322
|
Coding is hard, mkay?
|
2020-04-07 14:39:00 +03:00 |
|
|
Ghommie
|
f6db5764e3
|
Bringing back accidentally reverted solar panel fixes.
|
2020-04-06 18:20:34 +02:00 |
|
|
Putnam3145
|
5108bf1fc3
|
Stuff about power (#11664)
* Overhauled how APCs work, I guess
* Makes cells drain like before
|
2020-04-06 04:26:14 +02:00 |
|
|
Arturlang
|
598179553e
|
Changes making cablecuffs to using cable in your hand, instead of a menu. (#11702)
* There we go
* Ghommie suggestions
|
2020-04-03 18:34:26 +02:00 |
|
|
actioninja
|
abde27c098
|
layer changes
|
2020-03-28 23:50:08 -07:00 |
|
|
kevinz000
|
c39dd52b5f
|
Merge remote-tracking branch 'citadel/master' into eldritch_affairs
|
2020-03-27 21:32:40 -07:00 |
|
|
Putnam3145
|
5147536eb3
|
yeah whoops that should go (#11561)
|
2020-03-22 13:01:51 +01:00 |
|
|
kevinz000
|
18471be4ce
|
cult team
|
2020-03-10 20:11:18 -07: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 |
|