silicons
c36151b4cf
Update machine_designs_sci.dm
2021-01-09 15:35:26 -07:00
silicons
b0a94a6e1c
Update engineering_nodes.dm
2021-01-09 07:30:14 -07:00
silicons
34c5d99afb
Update machine_designs_sci.dm
2021-01-09 07:29:31 -07:00
silicons
ccbfd4015e
Merge pull request #13934 from shellspeed1/Ports-Navigation-Gigabeacon
...
Ports bluespace navigation gigabeacon from TG
2021-01-03 18:11:10 -07:00
silicons
2641332fb2
Merge pull request #13941 from Chiirno/ChemMixerHotfix
...
Portable Chem Mixer now added to the Biological Technology tech node.
2021-01-03 18:09:50 -07:00
DeltaFire
2ed866d855
boom
2021-01-01 07:22:10 +01:00
Chiirno
218cac1a49
OK, chem mixer has been added to a tech node now.
2020-12-31 22:19:51 -04:00
shellspeed1
45ce0a72a1
Ports bluespace navigation gigabeaconon
...
port of https://github.com/tgstation/tgstation/pull/44807
2020-12-31 01:49:38 -08:00
Lin
3ad777f8f7
Merge pull request #13755 from silicons/colormates
...
ports colormates from rp/vorestation
2020-12-20 18:14:48 +00:00
SandPoot
a0ae0c37fe
upload files
2020-12-16 11:39:50 -03:00
silicons
317f33b4e5
fixes
2020-12-11 05:14:23 -07:00
silicons
8f36a1d2ec
okay
2020-11-22 15:20:52 -07:00
silicons
18bdda1273
fix
2020-11-22 15:01:19 -07:00
silicons
13ebceb670
why did i do this
2020-11-22 14:56:02 -07:00
silicons
c7e60191df
whew
2020-11-22 14:44:05 -07:00
silicons
5ae410790b
locking
2020-11-22 14:40:57 -07:00
silicons
37e26833a6
wew
2020-11-22 14:16:14 -07:00
silicons
f8d43b7544
Merge pull request #13679 from DeltaFire15/system-corruption
...
[TESTMERGE ONLY] System Corruption for robotic species
2020-11-18 22:54:51 -07:00
DeltaFire
410ffffcc3
there we go
...
robot rad safe: 250, 750 with upgrade (500 for normal mobs)
Also some typo fixes
2020-11-15 20:30:50 +01:00
silicons
5b03f5b0ec
more
2020-11-12 23:36:18 -07:00
Putnam3145
f6b93a242c
Makes get_damaged_bodyparts use proper arguments ( #13570 )
...
* you're not being clever, you're being obfuscatory, stop this
* Made get_damaged_bodyparts use proper arguments
* Actually shouldn't have the arg
2020-10-17 11:44:15 +02:00
DeltaFire
a5fce4b6ed
Merge remote-tracking branch 'upstream/master' into robotic-limbs-PT2
2020-10-11 15:39:41 +02:00
silicons
d2ce6ca709
Merge pull request #13540 from TheObserver-sys/QoLPass
...
Service+Plumbing QoL Pass 1: Beakers, Belts, Plungers and Pipes
2020-10-10 22:04:49 -07:00
DeltaFire
4ccf40f775
Revert "Revert "Merge branch 'master' into robotic-limbs-PT2""
...
This reverts commit 27a099c6bf
2020-10-11 00:53:18 +02:00
DeltaFire
27a099c6bf
Revert "Merge branch 'master' into robotic-limbs-PT2"
...
This reverts commit 73b52674252e780bfff2
2020-10-11 00:51:39 +02:00
DeltaFire
73b5267425
Merge branch 'master' into robotic-limbs-PT2
2020-10-11 00:44:28 +02:00
silicons
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
The0bserver
0d1d94fd06
belt
2020-10-09 01:17:46 -04:00
The0bserver
0d8bea1c9b
QoL: Adds BSB's to Service, adds R.Plunger design
2020-10-08 23:27:17 -04:00
DeltaFire
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
silicons
1f82e8985c
Merge pull request #13314 from TheObserver-sys/ArcaneNutriMutaPort
...
No more chemspam: Ports portions of ArcaneMusic's botany rework from TG.
2020-10-01 12:15:49 -07:00
The0bserver
e0089ea813
Again?
2020-10-01 06:44:11 -04:00
silicons
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
The0bserver
48df6a9494
I shot the tray, I made an accurate tip.
2020-10-01 04:07:16 -04:00
silicons
9fc169a3ae
Merge pull request #13432 from SiliconMain/patch-6
...
Tweaks a thing
2020-09-27 00:33:14 -07:00
SiliconMain
4e5296438c
Update tool_designs.dm
2020-09-25 09:46:11 -05:00
Neko Boi Nick
6c8988c89c
Light replacer can print at Engineering
2020-09-22 10:42:56 -07:00
Timothy Teakettle
58737e42b9
empulse using range
2020-09-10 19:52:34 +01:00
timothyteakettle
e0f44ef717
new emps
2020-09-10 03:49:47 +01:00
BlackMajor
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
raspy-on-osu
9b56991f77
init
2020-09-02 17:54:35 -04:00
The0bserver
6b3a0c3531
A few changes, new fertilizer obtainable now.
2020-09-02 01:00:49 -04:00
silicons
9250a6d71d
Merge pull request #13275 from Chiirno/portable-chem-mixer
...
Portable chem mixer
2020-08-29 21:34:57 -07:00
Chiirno
fdc2cea077
added chem dispenser, time for errors
2020-08-27 14:27:35 -03:00
silicons
b2a38a09a1
circuit
2020-08-23 05:59:24 -07:00
silicons
bd5766a8be
changes
2020-08-23 05:27:53 -07:00
Letter N
b8d812fb47
"what if adminbus stops leaking confidential adminchat" and also updates admin things. you can now do obj/structure/singulo:50
2020-08-23 17:18:32 +08:00
silicons
120bcfc00c
Merge pull request #13178 from lolman360/plumb
...
[READY] ports plumbing (no more waiting for tgui4)
2020-08-20 21:32:26 -07:00
silicons
5414a8949c
Update text.dm
2020-08-19 08:50:26 -07:00
silicons
ce80f64d27
Update suppression.dm
2020-08-18 18:52:06 -07:00
