Commit Graph

9126 Commits

Author SHA1 Message Date
WJohn 299c7d4d52 Merge pull request #24450 from TrustyGun/box_autism
Improves box sprites
2017-02-26 19:45:37 -05:00
coiax 3dee7c96b6 Drone shell changes (#24379)
* Drone shell changes

Fixes #24376.

- Drone shells are now points of interest.
- Derelict drone shells are now just dusty drone shells.

* For GUN_HOG

* Adds ushanka to derelict drones

* Less compiling errors
2017-02-27 12:28:31 +13:00
Joan Lung cd29795b73 Clockwork objects are overall easier to deconstruct (#24424) 2017-02-26 15:31:26 -06:00
Joan Lung d5df752c0e Faction fixes (#24396)
* Faction fixes

* heh

* hup!

* i'm smart
2017-02-27 00:39:01 +13:00
TrustyGun e6cdb313a5 fixes syndie_box 2017-02-25 20:03:25 -05:00
Kyle Spier-Swenson 5ddeb50c29 Fixes progress bars when transferring between storages (#24413) 2017-02-25 17:51:30 -06:00
PKPenguin321 4d7cdce861 fixes paint and paint remover descs (#24417) 2017-02-25 17:49:13 -06:00
coiax f7e6327d0a The theme of a chef box is also in the name (#24426)
Previously it was only in the description. Makes it slightly more
obvious.
2017-02-25 17:48:48 -06:00
coiax 82e123a227 Adds plastic, makes plastic flaps constructable and deconstructable (#24257)
* Adds plastic, makes platic flaps constructable

🆑 coiax
add: Cargo can now order plastic sheets to make plastic flaps. No doubt
other uses for plastic will be discovered in the future.
/🆑

Later maybe we can make cable coils use plastic and metal, rather than
metal and glass. And make plastic tables. And make foam darts use
plastic rather than metal. And make spray bottles out of plastic. And
cheap plastic tables. And cheap plastic chairs.

Why? Because plastic makes sense as a material that you can make stuff
out of, and those DAMNED PLASTIC FLAPS AREN'T CONSTRUCTABLE.

* New plastic sheets sprite (STOLEN FROM BAY)

* Making plastic flaps takes time

* Constructable flaps

* Deconstruction time like walls
2017-02-25 15:54:09 +13:00
Robustin 260667bee1 Hulks can no longer use Pneumatic Cannons or Flamethrowers (#24383)
Edit: Gave flamethrowers back to drones #ThanksKor
Edit2: This also includes the species check that locks out ash lizards and golems I think

🆑 Robustin
tweak: Hulks can no longer use pneumatic cannons or flamethrowers
/🆑
2017-02-25 15:52:37 +13:00
Joan Lung ec226b4836 Moves His Grace's sprites to weapons.dmi (#24332)
* Moves His Grace's sprites to weapons.dmi

* hup

* here's my compromise
2017-02-25 14:42:40 +13:00
uraniummeltdown bf0f599a05 add science crates from /vg/ (#24349) 2017-02-24 12:08:36 -06:00
militaires ce34afa14c fixes kommisar konflikts and the final hopefully commit to the purge of non-3/4 boxes 2017-02-24 12:03:06 +03:00
militaires ac701e9299 Merge branch 'master' of https://github.com/tgstation/-tg-station into more_3/4
# Conflicts:
#	code/game/machinery/cloning.dm
2017-02-24 11:54:55 +03:00
militaires 288e99a194 try again 2017-02-24 11:52:00 +03:00
Kyle Spier-Swenson bf39570688 Lagchecks removing from storage, reverts bluespace ore satchel limit (#24310) 2017-02-24 16:22:57 +13:00
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
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
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