Commit Graph

1269 Commits

Author SHA1 Message Date
mochi
bffd50a3ff Fix Supermatter shard dusting AI on click 2020-10-08 19:48:47 +02:00
joep van der velden
7cd7d76eb6 Makes laser tags have 0 damage + check in field/generator/bullet_act 2020-10-03 15:26:20 +02:00
ppi13
8ffa7d9715 Makes slimes immune to tesla (#14394) 2020-09-25 16:16:50 -04:00
AffectedArc07
4ccc7a1b63 Removes Supermatter NanoUI (#14392) 2020-09-25 16:11:36 -04:00
Certhic
3fead8811b pacman tgui tweaks 2020-09-19 15:16:14 +02:00
Certhic
c0b0e9b508 pacman tgui 2020-09-19 00:06:36 +02:00
AffectedArc07
90fd9a8fb8 Removes all relative heresy (#13969)
Removes all relative heresy
2020-09-16 12:52:20 -04:00
SteelSlayer
72f80091bc fix after upstream merge 2020-09-16 09:38:57 -05:00
SteelSlayer
dab29cc668 Merge remote-tracking branch 'upstream/master' into spawn-removal 2020-09-16 09:38:20 -05:00
joep van der velden
0bfe9d994e Merge remote-tracking branch 'upstream/master' into bombing-logging-and-co 2020-09-16 15:26:19 +02:00
AffectedArc07
e02917f69f Merge remote-tracking branch 'ParadiseSS13/master' into pr/RedWolfie/14258 2020-09-15 22:04:01 +01:00
AffectedArc07
2219c31485 Merge remote-tracking branch 'ParadiseSS13/master' into pr/Kyep/14058 2020-09-15 16:57:35 +01:00
variableundefined
e9e634bb20 Merge pull request #14239 from AffectedArc07/singulo-warning-tweaks
Improvements to singulo logging
2020-09-14 20:40:46 -04:00
AffectedArc07
455bf0b5e8 Merge remote-tracking branch 'ParadiseSS13/master' into pr/Kyep/13888 2020-09-14 22:13:46 +01:00
SteelSlayer
2a70626c78 affected review tweaks 2020-09-14 11:38:17 -05:00
SteelSlayer
6caf4cfebf Merge remote-tracking branch 'upstream/master' into wires-tgui 2020-09-14 08:51:32 -05:00
AffectedArc07
a2c5fc39a8 Merge pull request #13751 from Fox-McCloud/alarm-overhaul
Overhauls and Refactors Alarm System
2020-09-14 13:54:06 +01:00
Fox McCloud
e6bd4b6638 fix ups 2020-09-13 18:33:21 -04:00
Certhic
094cd0528d Merge branch 'solars' of https://github.com/RedWolfie/Paradise into solars 2020-09-08 20:04:51 +02:00
Certhic
b857420e2b fixed bug in timed solar 2020-09-08 20:02:40 +02:00
RedWolfie
5e3e56ef56 Update code/modules/power/solar.dm
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2020-09-08 13:07:59 +02:00
Certhic
a60cbd3a36 tgui solar 2020-09-07 20:35:55 +02:00
AffectedArc07
41330a5de6 Improvements to singulo logging 2020-09-05 15:52:23 +01:00
Certhic
90ac9874b2 fixed orange crayons not making cables orange 2020-09-01 16:23:53 +02:00
Kyep
0d7f7fd9fb consistency 2020-08-29 14:51:04 -07:00
Kyep
40b08bcb33 var/list/data = list() 2020-08-29 14:28:55 -07:00
AffectedArc07
ebba3a322b Merge pull request #13703 from Fox-McCloud/tg-flying-floating-float-refactor
TG Flying+Floating Refactor
2020-08-27 20:08:35 +01:00
SteelSlayer
609d252fa8 Merge remote-tracking branch 'upstream/master' into wires-tgui 2020-08-15 13:13:50 -05:00
Kyep
5cd3a5cfd0 TGUI SMES 2020-08-11 00:03:32 -07:00
SteelSlayer
d928635393 Some spawn removals and other assorted code cleanup 2020-08-07 08:55:34 -05:00
Kyep
1fa9862a20 Update code/modules/power/singularity/narsie.dm
Co-authored-by: AffectedArc07 <josephcase55@hotmail.com>
2020-08-07 13:31:47 +00:00
Kyep
c0f98deeab Fixes cult summon runtime 2020-08-07 06:26:03 -07:00
SteelSlayer
06686a302a Adds a bunch of SStgui.close_uis(wires) 2020-08-01 14:40:06 -05:00
SteelSlayer
f5a74a7c19 tracker fix 2020-07-31 10:43:33 -05:00
Fox McCloud
994149c384 Merge pull request #13604 from SteelSlayer/malf-picker-action-button
Replaces two malf AI verbs with action buttons, gets rid of the malfunction verb tab
2020-07-21 16:55:34 -04:00
Kyep
2f55955534 defines, color-coding 2020-07-21 08:16:28 -07:00
Kyep
6e14ccd0cf Suggested changes, part 2 2020-07-21 07:43:03 -07:00
Kyep
3ff588392b Suggested changes part 1, apc.dm 2020-07-21 07:31:52 -07:00
Kyep
06f593ec24 Steel suggestions 2020-07-20 20:43:47 -07:00
Kyep
7b2aea807c aghosts 2020-07-20 17:01:37 -07:00
Kyep
3778cebe88 Port APCs to TGUI 2020-07-20 16:29:06 -07:00
SteelSlayer
2045759348 Merge remote-tracking branch 'upstream/master' into wires-tgui 2020-07-19 23:20:20 -05:00
warior4356
cb06ebdd9f Refactor complete. Matches added. 2020-07-13 22:05:56 -07:00
Fox McCloud
cc96e93bf3 fixes 2020-07-11 15:48:47 -04:00
Fox McCloud
85abb6505b Merge remote-tracking branch 'upstream/master' into alarm-overhaul 2020-07-10 15:05:37 -04:00
SteelSlayer
4305d1daea Fixes incorrect APC terminal orientation 2020-07-06 18:29:29 -05:00
SteelSlayer
960fe45410 actually I wanted to keep the attack hand bit 2020-07-05 01:44:57 -05:00
SteelSlayer
9cfd206885 tgui wires 2020-07-04 23:14:30 -05:00
Fox McCloud
85dc9136c6 singularity investigate 2020-07-01 22:07:30 -04:00
Fox McCloud
2019e3bfbb fixes 2020-07-01 21:09:33 -04:00