Commit Graph

1577 Commits

Author SHA1 Message Date
yogstation13-bot
90f9a6b410 [MIRROR] Fixes extra "a" in technology fabricator admin messages (#4654)
* Fix extra "a" in technology fabricator admin messages (#42970)
2019-03-03 04:00:23 -06:00
yogstation13-bot
efb536f016 [MIRROR] Love and Peace Potions No Longer Work on Megafauna (#4527)
* Love and Peace Potions No Longer Work on Megafauna

* Love and peace and megafauna (#42846)

Love and Peace Potions No Longer Work on Megafauna
2019-02-21 11:28:14 -05:00
81Denton
77e984b30b Rebalances bluespace beakers (#42792)
* Rebalances bluespace beakers

* based

Co-Authored-By: 81Denton <32391752+81Denton@users.noreply.github.com>

* fixes wrong diamond amount
2019-02-18 15:41:45 +01:00
oranges
0be40795e8 Merge pull request #42782 from 4dplanner/nanites
[s] A couple of returns
2019-02-16 11:57:31 +01:00
Tlaltecuhtli
1cc70fc3fb light replacer tweaks (#42720) 2019-02-13 07:41:43 +01:00
Qustinnus
a49515f3e4 Fixes some Golem issues and fixes the name of a durathread item #42587
cl Floyd / Qustinnus
tweak: Bonechill now actually chills you
tweak: Bonechill lasts 2 seconds longer
tweak: RESIST_COLD is checked before bonechill is applied
fix: Changes makeshift vests' name to durathread vest
fix: Cardboard golem can now reproduce himself.
fix: The durathread golem now needs cloth instead of strands
/cl
2019-02-04 21:32:05 +01:00
nichlas0010
a521f9067c Merge pull request #4381 from yogstation13/upstream-merge-42523
[MIRROR] Species types sources refactor, soviet and usa golem fix
2019-02-04 21:20:14 +01:00
monster860
1eada358a5 Update _production.dm 2019-02-03 10:50:27 -05:00
monster860
8abbd1976f Update rdconsole.dm 2019-02-03 10:50:00 -05:00
monster860
e46a7ca7be Update _production.dm 2019-02-03 10:48:47 -05:00
oranges
30597e05b0 Species types sources refactor (#42523)
There is now a bitflag that controls all the ways a species can be
selected from the different methods of changing species, xeno spawn,
pride mirror, magic mirror etc.

The soviet and capitalist golems are no longer selectable from the pride
or magic mirrors (just the badmin one)

interesting thing I found, androids and synths (including military
synth) are acheivable via xeno extracts!
2019-02-03 13:46:39 +01:00
pubby
bca3c55884 Drop "universal" from the suppressor name. (#42574)
It's incompatible with lots of guns so the name is misleading.
2019-01-30 08:32:29 +01:00
yogstation13-bot
dde7ce2d97 [MIRROR] Fixes adamantine armour (#4318)
* Adamantine armor sets flags_inv correctly (#42564)

* Fixes adamantine armour
2019-01-29 12:10:59 -05:00
Tlaltecuhtli
efd8adcd21 [ready]rcd upgrades (#42388)
* rcdstuff

* e
2019-01-27 14:08:11 +01:00
nichlas0010
98c829b2e7 Merge pull request #4214 from yogstation13/upstream-merge-42109
[MIRROR] Refactors NODROP flag into TRAIT_NODROP
2019-01-23 23:41:37 +01:00
nichlas0010
bb9e4bb014 Merge branch 'master' into upstream-merge-42109 2019-01-23 22:49:10 +01:00
nichlas0010
1b1090845f Update chilling.dm 2019-01-23 19:01:40 +01:00
Gh0sT2242
7a79b23bcd Nerf Time-stop
Nerfs time-stop from 30 sec to 15 sec
Solves Issue#4266
2019-01-23 11:57:04 -06:00
AdamElTablawy
cd1f9bba7a fixes chilling infinite timestop (#42432)
cl no
fix: Chilling Sepia extracts cannot be used infinitely and will be consumed upon use.
/cl

[why]:

Chilling sepia extracts, unlike all other crossbred chilling extracts, were not consumed after activation with plasma and thus could be spammed constantly if you injected them with plasma and then activated them, with absolutely no delay or cooldown in any form.

This is probably a bug, given that cerulean extracts, the ACTUAL infinite use extracts, have a delay on how many times you can activate them in a quick timespan and will stop working if you activate it within the cooldown, and that the description text itself describes the extract shattering.

Even if it wasn't a bug, infinite timestop with no cooldown and superior to the actual infinite extract is bad and needs to go.
2019-01-21 01:42:58 +01:00
Jordan Brown
3face379bc Merge pull request #42377 from WarJenkins/booger13-master
Adds the ability to create circuit floor tiles
2019-01-17 22:32:18 +01:00
coiax
66df5546ee Refactors NODROP flag into TRAIT_NODROP (#42109)
* Refactors NODROP flag into TRAIT_NODROP

🆑 coiax
fix: Anti-drop implants can no longer be used to drop objects that they
were not responsible for sticking to a person's hand.
fix: Backfiring with a Barnyard spellbook will now play a spooky horse sound.
refactor: Refactors the way that "NODROP" items work to a new system,
there should be no change in functionality.
/🆑

Various items in the codebase were doing weird hoop jumps in order to
preserve the nodrop flag's state when it also wanted to change it, so I
moved it to a trait system.

I may have gone overboard with the type of unique trait sources, but
those can be changed later. My long term plan is make a general "CURSED"
nodrop origin, which means you can unlock cursed items by being hit with
a bolt of door opening or something. But that's for another PR, this has
no functionality changes, apart from some slightly modified descriptions
on cursed masks.

- Removed a bunch of redundant voice changing code for all the voice
changing animal masks, used two new clothing flags for this purpose.
- Also refactored a bit the animal masks, making new cursed subtypes that play
the sound when created.

* Drop location
2019-01-17 21:22:38 +01:00
Qustinnus
41ccf70a54 [ready] Golem DLC pass 2018 (Adds new golem types) (#41951)
* Bronze golem

* adds creation

ad

* removes shit adds shit

* temp

* fff

* bone, leather and cardboard

* fff

* boneyard

* temp

* ahahahha dumb moron

* adds durathread golem sprites

* reee

* ass

* Auto stash before merge of "golemgang" and "origin/golemgang"

* fix

* uuh

* d

doned

* remove dupe
2019-01-16 19:40:35 +01:00
Ling
810efd1f05 Update xenobiology.dm 2019-01-12 19:41:35 +01:00
Ling
2640886ad6 Changes speed potion logic 2019-01-12 19:38:40 +01:00
nichlas0010
7ac3dc8ee7 Merge pull request #4003 from monster860/spacepods
SPACEPODS!
2019-01-06 17:52:51 +00:00
Ling
76b580585b Merge pull request #3943 from monster860/tool_switcher
Tool Switcher
2019-01-04 13:12:21 +01:00
Ling
00ee11dcf2 Merge pull request #3993 from monster860/non_crit_reactions
Experimentor non-critical reactions
2019-01-04 13:10:33 +01:00
monster860
f010620a22 Merge branch 'master' into tool_switcher 2019-01-03 20:21:13 -05:00
Jordan Brown
3f5de76a2e Heroine buds no longer chop the hairstyle of anyone wearing them 2019-01-02 17:04:50 +01:00
monster860
439b7d0fb6 SPACEPODS! 2019-01-01 01:39:01 -05:00
monster860
37758731f5 Experimentor non-critical reactions 2018-12-29 12:11:12 -05:00
Tlaltecuhtli
48699a4f21 Fix slime extract (#42096) 2018-12-29 02:17:16 +01:00
monster860
19332b37ee fadge 2018-12-26 08:00:31 -05:00
Jordie
a5751ef322 Merge pull request #41997 from coiax/removes-container-type
Refactors `container_type` into `reagents.flags`
2018-12-23 12:30:36 +01:00
monster860
2361c2400f Tool Switcher 2018-12-22 00:00:27 -05:00
kevinz000
71d4963b83 Fix division by 0 in R&D efficiency calculations (#42036) 2018-12-22 05:18:40 +01:00
moo
7ba10dfa5a Merge pull request #41976 from kevinz000/patch-588
Fixes accidental buff from switching deconstruction R&D to techwebs by NERFING protolathes to match autolathe scaling ( 100%-40% T1-T4 from 50%-12.5% T1-T4 construction efficiency)
2018-12-20 21:09:06 +01:00
nichlas0010
5ec00c2ea9 Merge branch 'master' into upstream-merge-41819 2018-12-18 17:04:34 +01:00
nichlas0010
95250160de Merge pull request #3899 from yogstation13/upstream-merge-41944
[MIRROR] Printed oxygen/plasma tanks no longer contain oxygen/plasma
2018-12-18 16:38:26 +01:00
moo
2c4580f887 Printed oxygen/plasma tanks no longer contain oxygen/plasma 2018-12-17 20:33:05 +01:00
XDTM
e172cc479c Turns TRAIT_NOCLONE into TRAIT_BADDNA for consistency (#41819)
cl XDTM
balance: DNA-damaging methods (changeling draining, mainly) no longer prevent alternative revival methods, but can no longer be circumvented by upgrading DNA scanners.
balance: Any source of husking now prevents cloning on unupgraded cloning scanners, instead of only husking caused by changelings.
balance: Husking now fully prevents revival from several non-cloning methods, including defibrillation, surgery, and strange reagent.
/cl

Why? Consistency! Also, the removal of prescanning/autocloning really simplifies this.

Changeling draining effectively prevents cloning until you transfer the brain to an intact body.
2018-12-17 17:17:50 +01:00
coiax
5edcfca3b7 Microwaves now have a single wire (#41822)
cl coiax
add: Microwaves have a single wire accessible when open, the activation wire.
When cut, the microwave will no longer function, when pulsed, the microwave
will turn on.
add: Stabilized dark purple extracts now cook items in your hands, rather than dropping
the cooked item on the floor.
/cl

Previously microwaves just worked on their contents, now they keep a subset of contents called ingredients, because otherwise it would explode whenever you put a signaler inside.

Someone asked me to do it. It seemed like a neat idea. God knows
what horrible things people will do with this.
2018-12-16 22:01:28 +01:00
skoglol
72dc45f482 Adds filled BRPED typepaths and adds t4 to debug outfit. (#41958)
Handy for testing machinery.

* Adds parts and BRPED to debug outfit.

* Added t1-t4 BRPED typepaths.
2018-12-16 13:22:33 +01:00
Jordie
273fd3133e Merge pull request #41906 from tralezab/patch-25
Prism glasses sanity fix
2018-12-14 02:49:42 +01:00
nichlas0010
c9ec0bfcf9 Merge pull request #3838 from yogstation13/upstream-merge-41903
[MIRROR] [S] You can no longer get infinite power cells from the EXPERIMENTOR
2018-12-13 21:54:11 +01:00
coiax
6e353f402b [S] You can no longer get infinite power cells from the EXPERIMENTOR (#41903)
🆑 coiax
fix: Fixes an exploit where you could get admin-only infinite power cells
from the EXPERIMENTOR.
/🆑
2018-12-13 20:37:21 +01:00
coiax
1cf74e3e54 Robotics can print cybernetic organs (also new upgraded cybernetic heart) (#41753)
🆑 coiax
add: Robotics can print cybernetic hearts, lungs and livers at their exofabricators (along
with their upgraded versions).
add: Added upgraded cybernetic heart, just like the regular cybernetic heart,
that doses you with epinephrine when unconscious. But the upgraded version generates a new
dose after five minutes.
/🆑

Robotics should be able to upgrade people with cybernetic organs. Medical want the organs
to save people's lives, Robotics want the organs for augmentation giggles.

Also, there was an upgraded cyberlungs and cyberliver, so I just made an upgraded
cybernetic heart as well.
2018-12-13 03:46:24 +01:00
moo
04cabec755 Merge pull request #41863 from Tlaltecuhtli/surgery-stufffffffffffff
advanced surgery tools
2018-12-12 17:46:35 +01:00
nichlas0010
b01fd7715c Merge pull request #3814 from yogstation13/mirrrororros
Mirrrororros
2018-12-11 20:51:45 +01:00
nichlas0010
0e2901ea87 Merge pull request #3815 from yogstation13/fucktime
[READY] Goon Genetics (#41258)
2018-12-11 14:45:28 +01:00