Commit Graph

6744 Commits

Author SHA1 Message Date
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
militaires a9c0e59aba pls 2017-02-20 23:06:05 +03:00
oranges 6c6cda8af6 Merge pull request #24282 from MrStonedOne/patch-314
bumps bluespace ore thingy up to 500 ores
2017-02-20 17:04:21 +13:00
oranges 216c0f4d62 Merge pull request #24227 from CPTANT/faster_disposals_construction
makes disposals construction faster
2017-02-20 17:03:10 +13:00
oranges 7224694303 Merge pull request #24059 from XDTM/RoboticEquality
Buffs robotic limb healing
2017-02-20 17:01:16 +13:00
Militaires d0b2fa15ec rare double latched toolboxes and very rare triple latched toolboxes (#24148)
* legendary

* the legendary

* wj_you_dont_understand

* my cycles of guilt are inescapable help me

* atomized pr for joan

* dosh fixees conflict

* aaaaaa

* the mad citrus

* reeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee fix conflict

* switch 0 1 true false

* moves add overlay cut overlay to update icons

* new to initialize
2017-02-19 20:48:25 +01:00
Pieter-Jan Briers 1956ace5c7 Merge remote-tracking branch 'upstream/master' into rebase-to-vg 2017-02-19 15:10:23 +01:00
Kyle Spier-Swenson daf8c0e47c bumps bluespace ore thingy up to 500 ores
\>going from infinite to 2x

\>not 10x

like come on. a 50dev bomb on produces 10 to 20k ore items and the server handles **throwing** them just fine, I think it can handle dumping more than 100 ores.
2017-02-19 00:50:40 -08:00
Marc R. Uchniat 7a5111c912 tank suicides now make use of pre-made procs, and more of them (#24207)
* tank suicides now make use of pre-made procs, and more of them

* makes tank suicides a little prettier
2017-02-19 17:15:20 +13:00
Pieter-Jan Briers ecd32661af Boost PDA light a tad 2017-02-18 23:47:18 +01:00
Pieter-Jan Briers 9b20c1e6c2 Merge remote-tracking branch 'upstream/master' into rebase-to-vg 2017-02-18 23:40:34 +01:00
Cyberboss 49f1e46161 Why do you guys hate the flags? (#24198) 2017-02-18 15:16:13 -06:00
Militaires 74d4a82db8 HIS GRACE ASCENSION (#24065)
* legendary

* the legendary

* wj_you_dont_understand

* my cycles of guilt are inescapable help me

* fixed conflickits

* okay pls do

* So tumblers two sealed deep inside
One lock made of Golem's hide
By Courga's grace and Fourga's pride
I bid you, portals, open wide.

* fixes his grace ascension further

* for joan

* more fixes

* gramer

* fix another fuckup with hisgrace

* final commit i pormis for his grace ASCENSION

* switches 0 1 true false
2017-02-18 22:11:53 +01:00
Pieter-Jan Briers b5b93e51f7 Merge remote-tracking branch 'upstream/master' into rebase-to-vg 2017-02-18 16:52:07 +01:00
CPTANT 801ae39391 makes disposals construction faster 2017-02-18 13:20:18 +01:00
oranges 740d184049 Places a cap on the bluespace mining bag (#24226)
This causes a server crash if you collect a huge number of ores and then
move them around

This is currently capped at about 2x the normal bag, which should still
be an upgrade on the current ore bag.
2017-02-18 05:59:09 -06:00
TrustyGun 38419057b7 Advanced Mimery Kit (#23978)
d

🆑
add: Traitor mimes can now learn two new spells for 15 tc.
add: The first, Invisible Blockade, creates a 3x1 invisible wall.
add: The second, Finger Guns, allows them to shoot bullets out of their fingers.
/🆑

Traitor mimes can buy the Guide to Advanced Mimery for 15 tc. Invisible Blockade creates a 3x3 invisible wall around the mime, and Finger Guns allows Mimes to shoot bullets out of their fingers.

Invisible Blockade is 3x1 now to avoid this problem and still make Mimes be blocked by their own walls.
2017-02-19 00:49:40 +13:00
Cyberboss b6d5aba7b2 Removes area.master. Moves area/New to Initialize (#24134)
* Removes master areas

* Ports area/New to Initialize
2017-02-18 01:04:47 +13:00
oranges e7933c3b24 Merge pull request #24119 from Lobachevskiy/glass-shards
Makes buckled and flying mobs avoid glass shards
2017-02-17 14:13:56 +13:00
Joan Lung db94a3d83b His Grace is a better item and less globally-announced (#23951)
* His Grace is a better item and less globally-announced

* grace

* graceful

* tiny eyes!

* tiny eeeeyes

* less lethal

* You must have His Grace.

* You just need to compile His Grace.

* highly lethal grace

* ding ding ding you're super fucked

* rrr

* His Grace
2017-02-16 15:18:45 +01:00
Steelpoint 46fae8ed6c Security Internal Jetpack (#23898)
* InitialCommit

* SecurityJetpack

* MoveToSuitStorage

* MergeConflict

* LeftAndRightInHands

* MergeConflict2

* InternalJetpack

* MergeConflicts3

* MergeConflict4

* MergeConflict5
2017-02-15 22:43:06 -06:00
Lobachevskiy 371b96bf62 Makes buckled and flying mobs avoid glass shards 2017-02-14 23:34:07 +03:00
oranges 89a3a9bf79 Merge pull request #24051 from Cyberboss/patch-13
Prevents energy weapons from being sharpened
2017-02-15 01:40:24 +13:00
oranges b45d26b0f8 Merge pull request #24022 from MrPerson/FILES_go_in_SINGLE_QUOTES_you_fuckwits
Puts files in single quotes like they belong
2017-02-15 00:57:28 +13:00
Cyberboss d27899ce64 Unequip refactor fix pack (#24040)
* Fixes drag drop deletion

* Fix it for clothing as well

* Do it properly

* Various other incap checks I noticed from the unequip refactor

* Time to generalize this shitty shit

* PADDLING!!!

* A whole bunch of ree
2017-02-14 08:52:56 +01:00
Jordie ff77631a8d Merge pull request #24024 from RandomMarine/pillsplitter
Splits charcoal pills apart
2017-02-14 10:57:44 +11:00
Jordie 02fca3d9a9 Merge pull request #24032 from ChangelingRain/rpdfix
Perpetual RPD fix
2017-02-14 10:10:58 +11:00
PJB3005 946ad1c6d3 Fix get_lumcount calls I missed. 2017-02-13 17:50:16 +01:00
XDTM ec0c5e0cc5 Buffs robotic limb healing 2017-02-13 15:43:44 +01:00
oranges 9add09a667 Merge pull request #23957 from swindly/soda_premium
Adds Nuka Cola as a premium item for Robust Softdrinks
2017-02-13 21:07:29 +13:00
Cyberboss 6f306f4250 Prevents energy weapons from being sharpened 2017-02-13 01:35:53 -05:00
PJB3005 6221b9fa98 COLORS 2017-02-12 23:53:22 +01:00
PJB3005 dec97db5b6 Merge remote-tracking branch 'upstream/master' into rebase-to-vg 2017-02-12 22:16:10 +01:00
Joan Lung eb9a1009d3 Perpetual 2017-02-12 15:55:35 -05:00
anconfuzedrock f8d9e14832 Adds crafting blindfolds, hacked autodrobes contain a blindfold and muzzles (#23953)
* I didn't want to make muzzles come from the autodrobe but I couldn't think of where else it could go

* Update vending.dm

* Update vending.dm

* Update sheet_types.dm
2017-02-12 17:55:05 +01:00
RandomMarine 6cfa865b4c splits apart charcoal pills 2017-02-12 08:40:22 -08:00
PJB3005 f11c558c99 Merge remote-tracking branch 'upstream/master' into rebase-to-vg 2017-02-12 16:35:57 +01: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
Joan Lung 6bf5deb0d2 Merge pull request #23966 from lzimann/ihatethis
Possessed blades now have a "Never for this round" button
2017-02-12 09:05:00 -05:00
Cheridan 74588b703b Merge pull request #23946 from coiax/hug-box-2
Clown internals box is now a box of hugs
2017-02-12 02:43:56 -06:00
coiax e4e192c3a3 BYOS shuttle restrictions (Shuttle changes #1) (#23904)
* BYOS shuttle restrictions (Shuttle changes #1)

🆑 coiax
add: The Build your own shuttle kit can only be bought in the first five
minutes of the shift.
/🆑

- BYOS restriction is to avoid grief.

* Moves the defines

* Ten minutes
2017-02-12 14:13:44 +13:00
oranges e45a0c16e6 Merge pull request #23948 from AnturK/implanterinio
Fixes silicon implants
2017-02-12 14:12:27 +13:00
Shadowlight213 c8c152bd37 Removes unused translate_hive var (#23924) 2017-02-11 18:37:44 -06:00
Joan Lung ca4b081e26 Fixes RPDs (#23985) 2017-02-11 17:51:34 -06:00
oranges cb9519f32f Merge pull request #23913 from ChangelingRain/rpdfix
Fixes being unable to place RPDs into storage items
2017-02-12 09:31:45 +13:00
Dannno 597242748a whhops 2017-02-11 14:34:14 -05:00
Cheridan c5d629685b Merge pull request #23938 from dannno/thank_you_dr_chine
new style toolboxes lol
2017-02-11 12:45:19 -06:00
Dannno bb5107f4b8 lmao i threw up on your ugly toolboxes you fat fags 2017-02-11 12:32:59 -05:00
Lzimann 23c68e3f16 Possessed blades now have an ignore category 2017-02-11 11:50:14 -02:00
swindly 6fc0d8c0b6 adds nuka cola to soft drinks 2017-02-10 21:47:59 -05:00