silicons
a1e92e55aa
Merge pull request #14102 from Hatterhat/somatobuff-50513
...
[READY] somatoray buff - mutation locks + revolution ray
2021-01-25 23:17:29 -07:00
Letter N
021b28a2b7
cleanup
...
shitcode - b - gone
2021-01-20 11:08:21 +08:00
Hatterhat
a8cb8b79c6
for one, dont forget the sprites, dumbass
2021-01-19 17:40:34 -06:00
silicons
dedb0cb62e
Merge remote-tracking branch 'citadel/master' into tgsync
2021-01-19 04:24:42 -07:00
DeltaFire
aa1cae9f33
Merge pull request #14054 from TheObserver-sys/AReturnToForm
...
Returns the Maintenance Shotgun to it's original recipe. Removes the Maintenance Rifle, and associated items.
2021-01-15 18:22:05 +01:00
The0bserver
1b469bdfda
The power of overwriting...
2021-01-14 01:03:48 -05:00
silicons
28849dd8e9
Merge pull request #14039 from Hatterhat/sticky-start
...
on the precipice of stickiness - sticky tape roundstart tech
2021-01-13 21:02:23 -07:00
silicons
ae290cf5f0
newlines
2021-01-13 16:56:36 -07:00
silicons
bcb2e16cef
Merge pull request #14035 from SiliconMain/baitbegone
...
Comments out hololocks
2021-01-13 16:53:01 -07:00
Hatterhat
b36a1142fe
on the precipice of stickiness
2021-01-12 16:58:20 -06:00
Hatterhat
cb40ad4764
atomization is cowardice actually
2021-01-12 16:08:17 -06:00
SiliconMain
bc64cedc2d
Update misc_nodes.dm
2021-01-12 14:42:35 -06:00
SiliconMain
a26590965e
Update misc_designs.dm
2021-01-12 14:41:10 -06:00
Lin
95101ac36a
Merge pull request #14013 from Citadel-Station-13/compressor
...
lets science actually print explosive compressors
2021-01-11 00:21:11 +00:00
silicons
fd77be9b89
Update _status_effects.dm
2021-01-09 16:44:56 -07:00
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
shellspeed1
04d60c85d9
a
2021-01-09 03:06:48 -08: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
