Commit Graph

531 Commits

Author SHA1 Message Date
Joan Lung
e2c7cda4bb Aliens now properly take double burn damage (#24655) 2017-03-06 11:58:41 +01:00
PJB3005
a63608d023 Merge remote-tracking branch 'upstream/master' into rebase-to-vg 2017-03-03 16:31:00 +01:00
XDTM
34aafab401 Fixes Voice of God (#24328) 2017-02-23 20:20:25 +01:00
coiax
05026eee88 Taste (#24323)
* Adding taste to reagents

* Toxins mostly taste bitter.

* The taste of medicine is mostly bitterness

* Drugs taste bitter too

* It turns out pyrotechnics mostly taste like burning

* Alcohol and blob tastes

* Drinks taste mostly of drinks

* And the food reagents are the last, but not least

* Actual taste code

* You can now taste freshly spawned carrot cake

* Bread, burgers

* Debugging tasting

* Always add the reagents properly, I guess

* Finally got nutriment scaling working

* Finally got all the stuff working and mixing

* PEOPLE CAN NOW TASTE THINGS

* Mouthful only has one L

* Meat n dough

* Eggs and cakes

* Meat dishes taste of meat

* Others...

* Pastry... there is no end to the food

* PIE AND PIZZA

* SANWHICHES, SALAD, SOUP

* THE LAST OF THE FOODS ARE COMPLETE

* Weird indentation issues fixed

* Remove dat debug code

* Hydroponics and sugar is less strong

* Replaces carrot cake reagents

* Code review

* Fixes bad flavours
2017-02-23 00:59:34 -06:00
Cheridan
1d239f9ed3 Merge pull request #24369 from KorPhaeron/arms2
[s]Fixes augments being invisible
2017-02-22 22:52:17 -06:00
KorPhaeron
b789f8503f Fixes invisible augmetic limbs 2017-02-22 19:55:31 -06:00
coiax
de0b29dea6 Partially grown clones are horribly disfigured + cardiac arrest refactor (#24106)
add: Refactors heart attack code, a cardiac arrest will knock someone unconscious and kill them very quickly.
add: Adds corazone, an anti-heart attack drug, made by mixing 2 parts Phenol, 1 part Lithium. A person with corazone in their system will not suffer any negative effects from missing a heart. Use it during surgery.
add: Abductor glands are now hearts, the abductor operation table now automatically injects corazone to prevent deaths during surgery. The gland will restart if it stops beating.
fix: Cloning pods always know the name of the person they are cloning.
add: You can swipe a medical ID card to eject someone from the cloning pod early. The cloning pod will announce this over the radio.
del: Fresh clones have no organs or limbs, they gain them during the cloning process. Ejecting a clone too early is not recommended. Power loss will also eject a clone as before.
del: An ejected clone will take damage from being at critical health very quickly upon ejection, rather than before, where a clone could be stable in critical for up to two minutes.
add: Occupants of cloning pods do not interact with the air outside the pod.


After @Cyberboss 's multi-pod cloning got merged, I scrapped the multi-pod stuff from my own work, and brought back the maiming.

Early ejected clones being partially disfigured is a cool feature.

This penalises (but does not completely remove) speed cloning, as there is a window where the clone can be ejected without missing any limbs or organs. Otherwise the clones will probably die due to lack of lungs or heart.

Heart attacks are more lethal, there's an easy medicine for treating them, if chemistry have it on hand.

Clones not reacting to the air around them is a buff to plasmamen (although they'll still burn to death once they're ejected in an oxygen atmosphere).
2017-02-21 11:13:54 +13:00
BroseidonMOO
f6a91ce346 Prevents Voice of God from sleeping non-organics (#24280)
* Prevents Voice of God from sleeping non-organics

* Update vocal_cords.dm

* Update vocal_cords.dm

I am really dropping the ball on this stuff.
2017-02-20 22:47:26 +13:00
XDTM
44c16a3448 Refactors VoG into a proc/spell (#24117)
* Makes VoG into a spell

* conflicts

* ARE YOU QDELETED
2017-02-20 09:49:53 +13:00
Pieter-Jan Briers
b5b93e51f7 Merge remote-tracking branch 'upstream/master' into rebase-to-vg 2017-02-18 16:52:07 +01:00
oranges
f3f5b44e20 Merge pull request #24064 from KorPhaeron/eyes4
Fixes alien eye toggle
2017-02-15 15:55:42 +13:00
KorPhaeron
854d84d03c Fixes alien eye toggle 2017-02-13 10:35:05 -06:00
MrPerson
9dd81f1da8 Puts files in single quotes like they belong
This means they're included into the rsc and sent out althogh almost all of these files were already included elsewhere. Also DM will yell if the file couldn't be found for whatever reason like if someone moves or renames it.

I left out some file types for various reasons
dmis used in overlays: I have another pr I'll do later which will fix all of them and I don't want to conflict with myself
text files: they would get included in the rsc, which is completely unnecessary. However they're small, so they might be worth including anyway
2017-02-12 07:15:18 -08:00
PJB3005
3c8b98a3aa 9/11 2017-02-08 15:07:58 +01:00
PJB3005
8ce6ae2b87 Merge remote-tracking branch 'upstream/master' into rebase-to-vg 2017-02-08 14:30:23 +01:00
oranges
99c7a8d74a Merge pull request #23766 from KorPhaeron/surplus_limbs
Replaces the limb grower with a box of surplus limbs
2017-02-08 18:28:38 +13:00
Cyberboss
cfd836bdc4 Fixes a dismemberment runtime (#23791) 2017-02-07 16:30:46 -06:00
swindly
bc5937cb03 makes organs robotic (#23756) 2017-02-06 15:16:29 -06:00
Christopher
950564b5c8 Fixes plastic surgery grammar issue. (#23713)
Fixes Plastic Surgery Grammar Issue

Changes plastic surgery appearance changing from saying "Zion Murphy are now Murphy Zion" to something that makes more sense within the English language "Zion Murphy is now Murphy Zion"
Changelog

🆑 Tofa01
Fix: Fixes grammar issue when changing someones appearance via plastic surgery.
/🆑
Fixes #23704
2017-02-06 18:30:48 +13:00
KorPhaeron
4eaaa168a3 Replaces the limb grower with surplus limbs 2017-02-05 21:59:21 -06:00
KorPhaeron
8f5b9a3aa0 It should probably actually compile 2017-02-04 08:38:06 -06:00
KorPhaeron
858e2950b1 Revert "Luminosity"
This reverts commit 57ae996d89.
2017-02-03 22:57:23 -06:00
KorPhaeron
57ae996d89 Luminosity 2017-02-03 22:57:01 -06:00
KorPhaeron
3d5443212b Fixes a runtime 2017-02-03 21:58:45 -06:00
KorPhaeron
0b79d25b9d Undoes a fix that somehow broke everything instead 2017-02-03 21:17:51 -06:00
KorPhaeron
99dddbfdfc Fixes eyes not updating properly after surgery 2017-02-03 20:17:15 -06:00
KorPhaeron
f9350ff38e Eyeball sprites 2017-02-03 20:04:36 -06:00
KorPhaeron
71e958b44e Eyes travel with the head when dismembered 2017-02-03 19:13:47 -06:00
KorPhaeron
c47c6a4169 No eye surgery for people without eyes 2017-02-03 18:53:04 -06:00
KorPhaeron
6ad9b5abe1 Replaces cybernetic implants with cybernetic eyes 2017-02-03 18:47:49 -06:00
KorPhaeron
f50e88c16f Gives aliens, shadowpeople, monkeys, devils eyes 2017-02-03 17:34:34 -06:00
KorPhaeron
9745224888 Eyes As Organs 2017-02-03 15:38:26 -06:00
Joan Lung
4c71b31f6f Merge pull request #23616 from KorPhaeron/flashlight_eyes
Flashlight eyes
2017-02-03 15:03:30 -05:00
kevinz000
910a986dbe Removes the changeling test (#23592)
* Update brain_item.dm

* Update dismemberment.dm

* Update brain_item.dm

* Update brain_item.dm
2017-02-02 11:45:21 +01:00
KorPhaeron
c92241782d Tint Updating 2017-02-01 19:13:32 -06:00
KorPhaeron
78a1902b46 Flashlight Eyes 2017-02-01 19:06:41 -06:00
oranges
26b0a52d60 Merge pull request #23226 from ChangelingRain/dismemberstun
Cutting off legs no longer stuns
2017-01-31 09:31:44 +13:00
Cyberboss
3f7f5d4000 Removes/Refactors /mob/unEquip (#22918)
* Part1

* IT COMPILES!!!!

* Fuck wait this was missing from that last

* Update handlabeler.dm

* Update handlabeler.dm

* Fixes n shit

* Fix this

* Fixes #23310

* Fucking @RemieRichards was right

* Fixes devil unEquip

* WTF ARE BITFLAGS?

* THERES THE FUCKING PROBLEM

* Fixes
2017-01-31 09:28:31 +13:00
XDTM
fcf4320bb5 [Ready for review/merge]Rolls chainsaw surgery into prosthetic replacement, makes synthetic armblades implantable (#23213)
🆑 XDTM
tweak: Implanting chainsaws is now a prosthetic replacement instead of its own surgery.
add: You can now implant synthetic armblades (from an emagged limb grower) into people's arms to use it at its full potential.
del: Chainsaw removal surgery has been removed as well; you'll have to sever the limb and get a new one.
/🆑
Reason for adding

Makes the surgery code more consistent, without a snowflake surgery for chainsaws. This also gives a legitimate use for synthetic armblades, which were otherwise just a much shittier and harder to get circular saw.
2017-01-30 09:51:55 +13:00
Core0verload
6c2f5a4b71 Genocides "_s" in icon states (#23366)
* Genocide of "_s", part 1: mutations

* Genocide of "_s", part 2: aliens

* Genocide of "_s", part 3: augments

* Genocide of "_s", part 4: facial overlays

* Genocide of "_s", part 5: underwear

* Genocide of "_s", part 6: uniforms

* Genocide of "_s", part 7: animal body parts

* Genocide of "_s", part 8: human body parts

* Adds back icons used by hallucinations

* Changes some icon states from "broken" to "still broken"
2017-01-29 11:22:24 -06:00
XDTM
ade5529b04 [Ready for review/merge]Adds some new voice of god commands, allows first-name focusing (#23169)
* New commands!

* helper

* replacements

* regexes left and right

* someone might actually refer to medical doctors with the full name

* Cooldowns first
2017-01-26 15:17:12 +01:00
coiax
adfd8b0b3c Nuke ops cybernetics changes (#22817)
* Nuke ops cybernetics changes

Fixes #22814.

🆑
del: Nuclear operatives no longer get free autoimplanters when
they purchase cybernetic implants, except in the cybernetic implant
bundle.
fix: The cybernetic implant bundle now actually contains implants.
/🆑

* Changes descriptions rather than behaviour

* No discounts for discounts
2017-01-26 08:15:05 -06:00
Joan Lung
48c29c1308 Merge pull request #23308 from lzimann/lzimann-patch-1
Fixes anti-drops implants not working
2017-01-25 21:49:04 -05:00
Joan Lung
def68c3c9f Proselytizers can now repair Servant silicons and clockwork mobs (#23220) 2017-01-25 03:35:06 +04:00
Cyberboss
79ed2c2038 Fixes heads not having a real name (#23281) 2017-01-24 11:24:14 -05:00
Leo
087a6c38b6 Fixes anti-drops implants 2017-01-24 13:56:35 -02:00
Core0verload
bc8c30e5bc Fixes for my own shit, mostly (#23199)
* Fixes scalpel having 30% success probability on "incise" step

* Adds some feedback to notes errors
2017-01-23 11:20:00 +01:00
Joan Lung
235f379f09 Cutting off legs no longer stuns 2017-01-21 16:03:12 -05:00
XDTM
3f2a32a991 Gives androids the robotic speech span (#23167)
* Gives androids the robotic speech span

* i no has can
2017-01-21 12:23:53 +01:00
Core0verload
b3b2b62021 Allows any sharp item for "incise" surgery step (30% success) (#22656)
* Allows any sharp item for "incise" step

* difines
2017-01-19 22:01:55 -05:00