Commit Graph

9109 Commits

Author SHA1 Message Date
WJohn a13a52a98f Merge pull request #24348 from dannno/vendy
Sodie pops
2017-02-23 07:55:34 -05: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
Cyberboss 19f43fff9f Fixes the fire overlay never being cut (#24354) 2017-02-23 09:01:21 +13:00
Dannno 5536203297 why do we even do it like this, why would we not make them restock the maximum amount possible just by default 2017-02-22 10:47:49 -05:00
MrPerson f4e768c895 Ion storm improvements (#24223)
* Ion storm improvements

Ion storms have several new additions:
25% chance to flatly replace the AI's core lawset with something random in the config. Suddenly the AI is Corporate, deal w/ it.
10% chance to delete one of the AI's core or supplied laws. Hope you treated the AI well without its precious law 1 to protect your sorry ass.
10% chance that, instead of adding a random law, it will instead replace one of the AI's existing core or supplied laws with the ion law. Otherwise, it adds the generated law as normal. There's still a 100% chance of getting a generated ion law.

All of these stack so you could wind up going from Asimov to Paladin w/o the first law and w/ the last law replaced with THE SHUTTLE CANNOT BE CALLED DUE TO FIVE NINJAS. All the values are easy to tweak if you guys want them higher or lower or whatever.

Custom admin-sent and other fake ion storms (devils) will just add the law and have no chance of doing any of the bonus stuff.

Removed the admin verb to send an ion storm since you can just use the events panel.

Cleaned up some of the law-adding backend. Hopefully there's no double showing of the AI's laws after a lawchange as a result of this.

* Everyday I'm shufflin'
2017-02-22 13:31:04 +01:00
Cyberboss 56a6eaa8e6 Overlay queuing (#23922)
* Overlay queuing

* Fix SS flags

* Don't copy on assignment

* Flags processing

* Fix icon_smoothing

* MSO's helper proc

* Legacy detection

* Make it work

* Fixes shitcode

* Fix the flag

* |= -> +=

* OK, how did I fuck that up?

* shitcode

* Conditional assoc queue while initializing

* Cleanup everything

* Orange meme

* This isn't perfect, but its the best byond will give us.

* forgot about dir

* oh ya

* This was litterally the last thing i did last night before heading to bed

You can tell can't you?

* Fixes various shit

* Let's not ever pause

* Fix the flag

* Cleaned up some missing shit. Added image dummys

* Remove the one usage of FPRINT

* Jesus get rid of this
2017-02-22 21:44:55 +13:00
Dannno b3463d20ce weeeeooooweeoowowowowow i deed it yah wah one up!!! 2017-02-21 20:59:29 -05:00
Xhuis dd9ef0dd0f Small Highlander patch (#24175)
* Enforces honorable combat

* Now with compiling!

* someBODY once told me the WORLD is gonna roll me

* DOES THE NEEDFUL
2017-02-22 12:00:06 +13:00
danno "big fucking moron" brando 93a49d03e6 danil mubme (#24339) 2017-02-21 15:45:19 -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
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
oranges 3583ec8cd0 Merge pull request #24191 from ChangelingRain/griffdisabled
Makes it harder for Servants to accidentally fuck up
2017-02-20 10:08:07 +13:00
Joan Lung 37ff70d48a Taunting Tirade is more true to its intent (#24234)
* Taunting Tirade is more true to its intent

* less powerful

* eh, they have vanguard if they need that
2017-02-20 09:40:32 +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
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
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
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 1e7603178a Revert "Ports some low level New()s to Initialize" 2017-02-17 20:53:28 -05:00
Joan Lung 1806f0ffe8 Merge pull request #24132 from Cyberboss/LowLevelInitialize
Ports some low level New()s to Initialize
2017-02-17 20:52:17 -05:00
Joan Lung 6c6259bb43 Makes it harder for Servants to accidentally fuck up 2017-02-17 12:25:46 -05: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 eca3d7450a Merge pull request #24060 from Cyberboss/ProgressFix1
Fixes progress bar spam building racks
2017-02-17 14:19:01 +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
Cyberboss aa82645401 Ports some low level New()s to Initialize 2017-02-15 09:24:52 -05:00
oranges a0bf3d2c4d Merge pull request #24067 from Cyberboss/WTF
Fixes massive throwing runtimes
2017-02-15 15:52:49 +13: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
Leo 9c6803ae19 Ports Paradise error handler, with in game runtime viewer! (#24036)
* Ports paradise error handler, with in game runtime viewer!

* Changes to the old runtime error and removes inerror reference

* Oops

* Adds a wrapper for world.log so it displays both in the runtime diary and in DD window
2017-02-14 11:39:31 +11:00
Jordie ff77631a8d Merge pull request #24024 from RandomMarine/pillsplitter
Splits charcoal pills apart
2017-02-14 10:57:44 +11:00
uraniummeltdown 57c89e3dae More Window Flashing (#23923)
* added window flashing pref, added windowflashing to notify_ghosts, pollCandidates and similar procs

* disabled window flash for golem shells, ash walker eggs, drone shells and posibrains

* ignorepref var for ahelp/apm and roundstart
2017-02-14 10:49:06 +11:00
Jordie 02fca3d9a9 Merge pull request #24032 from ChangelingRain/rpdfix
Perpetual RPD fix
2017-02-14 10:10:58 +11:00
Cyberboss ee257e1c91 Fixes massive throwing runtimes 2017-02-13 12:15:49 -05:00
Cyberboss 41a36921b6 Fixes progress bar spam building racks 2017-02-13 10:01:47 -05:00
XDTM ec0c5e0cc5 Buffs robotic limb healing 2017-02-13 15:43:44 +01:00
coiax 70e66069b8 Admin tool, the life candle! (#23955)
* Admin tool, the life candle!

🆑 coiax
add: Added an admin only tool, the life candle. Touch the candle, and
when you die, you'll respawn shortly afterwards. Touch it again to stop.
Used for testing, thunderdome brawls and good old fashioned memery.
/🆑

Requested.

* Bug fixes

* Moves life_candle.dm
2017-02-13 21:12:13 +13: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
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