4f734f68a9
moves damage checks
...
title. Makes it harder to circumvent them.
2020-10-11 16:18:25 +02:00
a5fce4b6ed
Merge remote-tracking branch 'upstream/master' into robotic-limbs-PT2
2020-10-11 15:39:41 +02:00
face07f532
Update supermatter.dm
2020-10-11 00:45:01 -07:00
8be9e0aaad
Merge pull request #13530 from Citadel-Station-13/silicons-patch-12
...
THROWING A CLOWN INTO THE SUPERMATTER ENGINE NOW RANDOMLY ADJUSTS ENERGY AND DAMAGE
2020-10-11 18:43:49 +13:00
b2336f1140
Merge pull request #13527 from ArchieBeepBoop/rtg
...
Fully Upgraded Advanced RTG Machine Preset
2020-10-10 22:01:20 -07:00
4ccf40f775
Revert "Revert "Merge branch 'master' into robotic-limbs-PT2""
...
This reverts commit 27a099c6bf
2020-10-11 00:53:18 +02:00
27a099c6bf
Revert "Merge branch 'master' into robotic-limbs-PT2"
...
This reverts commit 73b52674252e780bfff2
2020-10-11 00:51:39 +02:00
73b5267425
Merge branch 'master' into robotic-limbs-PT2
2020-10-11 00:44:28 +02:00
19f1e99a8c
mass ports like 15 tg prs + counting ( #13386 )
...
* changes
* ok
* changes
* sigh
* fixes
* changes
* fix
* fix
* alright
* fixes
git pus
* fix
* fix
* fix
* test
* ok
* Update code/modules/paperwork/ticketmachine.dm
Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com >
* ok
* compile and other stuff
* ok
* fix
* fix
* Fix
* Update menu.dm
* Update view.dm
* Update preferences.dm
Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com >
Co-authored-by: Putnam3145 <putnam3145@gmail.com >
2020-10-10 12:20:33 +02:00
385bd57940
reworks family heirlooms, adds heirlooms that can be based off your species ( #13444 )
...
* corgi tracker
* better heirloom system
* typo
2020-10-10 12:15:39 +02:00
b341a71550
Update supermatter.dm
2020-10-06 11:52:18 -07:00
7a674fc51d
Update supermatter.dm
2020-10-06 11:50:39 -07:00
4146566af0
hoo boy
...
replaces all mentions of bodypart_robotic with is_robotic_limb() where possible, adds BODYPART_HYBRID, adds helpers for organic / robotic limbs (is_robotic_limb() / is_organic_limb(), with a arg to override it accepting hybrid limbs)
Also makes the the surgery to heal robotic limbs work if the torso isn't a robot, but rather if there are robotic bodyparts, makes the IPC brain repair.. only accept IPC brains (obviously), makes the damage threshholds for robo-limbs vars instead of a fix 25 with hybrid ones predefined at 25 / 15 (trigger / mindamage), adds an error message to fixing them if already at theshhold, etc. Now just for replacing BODYPART_ORGANIC with is_organic_limb aswell where applicable.. also actual values for the other robo limbs. Fun!
2020-10-06 17:34:13 +02:00
b81d1f5994
Fully Upgraded Advanced RTG Machine Preset
2020-10-06 05:26:40 -03:00
7726b0456c
Merge branch 'master' into cool-ipcs
2020-10-01 21:06:16 +01:00
8b36cf6f64
Merge pull request #13375 from timothyteakettle/emp-rework
...
the emp rework (emp severity reduces as you move from epicentre, severity is 1-100)
2020-10-01 03:01:18 -07:00
2b5a166425
Merge pull request #13421 from raspy-on-osu/teg-finale
...
alters the TEG's logistic power generation
2020-09-27 00:15:41 -07:00
87d65d5c58
init
2020-09-22 15:11:46 -04:00
435565f1d8
Merge remote-tracking branch 'origin/master' into TGUI_Updoot
2020-09-21 00:16:12 +03:00
12bf3aebda
Merge remote-tracking branch 'upstream/master' into cool-ipcs
2020-09-16 05:12:20 +01:00
125b50d392
Merge branch 'master' into cool-ipcs
2020-09-16 05:09:02 +01:00
58737e42b9
empulse using range
2020-09-10 19:52:34 +01:00
e0f44ef717
new emps
2020-09-10 03:49:47 +01:00
f1cd94fc97
emp rework
2020-09-09 23:14:06 +01:00
1943a2fdd7
Merge pull request #13246 from silicons/anomaly_manufacturing
...
anomaly manufacturing port from tg. supermatter anomaly generation nerfed to 20% rather than removed
2020-09-06 17:53:35 +12:00
b186f8ac05
init
2020-09-02 20:26:43 -04:00
3bef4ba35e
TGUI updates + statpanel
2020-09-02 17:52:47 +03:00
50cf863501
Merge pull request #13263 from raspy-on-osu/tesla-groundingrodspull
...
Tesla Counterplay.
2020-08-29 21:24:41 -07:00
e16abbc945
Merge pull request #13280 from raspy-on-osu/teg-castration-2
...
Further tweaks the TEG's power output
2020-08-29 21:19:18 -07:00
ae482c1bb8
Merge remote-tracking branch 'origin/master' into TGUI-CHAT-TGUI-CHAT-TGUI-CHAT
2020-08-29 14:09:56 +08:00
d116dd49b2
teg tweak
2020-08-27 23:04:00 -04:00
172fe663c3
remove redundant separate tesla log and merge it into the singulo log
...
also formatting because i hate inconsistent whitespace
2020-08-27 02:46:19 -04:00
350a99a4ba
teslas now fizzle at 0 energy and adds admin log for fizzles
...
fixing the tesla engine 100% speedrun world record
2020-08-27 02:39:09 -04:00
68cb78ba51
why is this here
...
no really how the fuck did this happen
2020-08-27 00:03:58 -04:00
7840205d4e
shuffle containment checking for optimization
...
now it should be checking less (tested, functionally identical to before)
2020-08-26 23:59:15 -04:00
f3990732f3
remove excess whitespace
...
title
2020-08-26 21:25:45 -04:00
6fc019ebf8
create unique containment check for the tesla
...
it now functions as normal. it only checks for containment in a 10 tile radius (this should work fine for the default setups of Delta and Lambda).
2020-08-26 21:20:23 -04:00
46bec76f41
tesla can now be contained
...
for whatever reason, the contained variable was unused for teslas, but now it is
unintentional side-effect may be that grounding rods for tesla containments with a larger than 1x1 tile space might get eaten (untested but assumed)
2020-08-25 00:46:04 -04:00
1a5248359c
if(rods) literally just eats disk space and nothing more
...
no longer. 300 bytes saved
2020-08-24 23:46:38 -04:00
2e5517b9f3
if committing above suggestion, remove these two lines
...
ok done
2020-08-24 23:36:37 -04:00
1fdb233ede
Update code/modules/power/tesla/energy_ball.dm
...
Co-authored-by: Putnam3145 <putnam3145@gmail.com >
2020-08-24 23:35:17 -04:00
77015ed166
Update code/modules/power/tesla/energy_ball.dm
...
Co-authored-by: Putnam3145 <putnam3145@gmail.com >
2020-08-24 23:33:27 -04:00
df30569104
Update code/modules/power/tesla/energy_ball.dm
...
Co-authored-by: Putnam3145 <putnam3145@gmail.com >
2020-08-24 23:32:48 -04:00
591fc16747
oops! no grounding rods
...
now it (hopefully) won't delete rods from within containment
2020-08-24 23:20:28 -04:00
9743e5b458
tesla counterplay??
...
just put out some grounding rods and it'll eat up the rods at expense of some energy
2020-08-24 23:10:44 -04:00
2439a0654b
it likes moving grounding rod
...
now it actually gets the dir instead of just adding the rod itself to the pick
also moved declaration of move_dir because dm was freaking out because i had two declarations
2020-08-24 20:54:36 -04:00
580afaf74a
init
...
first attempt
2020-08-24 20:29:25 -04:00
40b489006d
Merge pull request #13225 from raspy-on-osu/teg-castration
...
Heavily nerfs the TEG.
2020-08-23 17:52:44 -07:00
b995581a11
changes
2020-08-23 05:33:19 -07:00
bf799472d1
fixes the APC access check
2020-08-21 19:35:58 +02:00
DeltaFire