Commit Graph

2336 Commits

Author SHA1 Message Date
ACCount
1dd86ea128 Fixes meth explosion throwing warnings (#33356) 2017-12-09 02:09:28 -05:00
oranges
eddf889598 Merge pull request #33341 from ShizCalev/31-bottles-of-beer
Fixes mugs being called "broken bottles"
2017-12-08 22:24:37 +13:00
ShizCalev
c3383d1520 Fixes mugs being called "broken bottles" 2017-12-07 13:52:03 -05:00
XDTM
550d71167e Brain Traumas (#31727)
* Reworks Brain Damage

* mechanics

* rebalancing

* hulks in wheelchairs

* yup

* bugsquash

* Adds narcolepsy, phobias and agnosia. Not guaranteed 100% bug-free yet, testmerge at your own risk.

* lizard phobia

* Did you know there's a skeleton inside of you RIGHT NOW?

* Fixes for the new stuff

* The issue with those is that in most rounds you won't see them

I'll keep them available so they can be added manually, for example by events and such

* Goof reviews

* Brainloss is based off brain organ integrity

removes brainloss var

* Replaces some getorganslot with defines

* eyes

* put the traumas in the brainnnn

* text

* args

* Adds godwoken, puts split personality in severe, adds brainwashing

* Bluespace prophet special trauma (untested)

* Some minor stuff

* Monophobia, and tweaks

* More fixes

* fix

* a

* new tail

* Discoordination and Muscle Weakness

* thanks for the review!

* [B]oneless

* agnosia fix

* .

* go away agnosia

* pretend it didn't happen

* Shitcode-free-er

* bitwisdom

* psychotic brawling

* i guess this might be important

* latest reviews

* .

* conflict-free

* addresses it

* surgery fix

* a masterpiece

* fix

* fix again

* config

* damage formula reworked

* who needs to test anyway

* fixes some bugs

* fix 2

* proper spookin

* bluespace prophet fixes and improvements

* no bible healing

* .

* normalizes monophobia chances
2017-12-06 13:04:17 -05:00
Kyle Spier-Swenson
8c4885cf6e Revert "Ore Stacking (#33062)"
This reverts commit 8e1ac5720d.
2017-11-28 22:56:54 -08:00
kevinz000
8e1ac5720d Ore Stacking (#33062) 2017-11-28 21:27:34 -05:00
ShizCalev
2abae67fd0 Cleans up goldcore defines (#33090)
* Cleans up goldcore defines

* Tweaked commentary.
2017-11-26 16:51:54 -06:00
Mark9013100
e6ec0f267b Oldstation edits/fixes (#33080) 2017-11-26 01:01:03 -05:00
oranges
73b25d7ef2 Refactor on_reagent_change to pass through the change type (#32805)
this is purely so the smoke circuit can reset the notification only when
reagents are actually added to it
2017-11-24 12:45:44 +01:00
ShizCalev
ed12ad417d Updates some item drops to use drop_location() (#32994)
* Updates some item drops to use drop_location()

* Little more cleanup
2017-11-24 06:04:50 -05:00
Emmett Gaines
7c69cdcb8a Revert math (#33059)
* Revert "all this wrapping and it's not even christmas (#33035)"

This reverts commit faaf151580.

* Revert "fuck me for forgetting to graph this one"

This reverts commit 45d7acea2f.

* Revert "defines math"

This reverts commit 2817a1737b.
2017-11-23 20:59:52 -05:00
ninjanomnom
2817a1737b defines math 2017-11-22 17:36:58 -05:00
oranges
ccd4981fe5 Merge pull request #32624 from kevinz000/component_uplinks
[READY]Refactors uplinks to a component!
2017-11-23 10:16:16 +13:00
ShizCalev
b0f24a892b Fixes bartender suit having an adjust state (#32968) 2017-11-22 13:40:11 -05:00
ShizCalev
02abe5d92f Makes drinking glasses smash when thrown (#32890)
* Makes drinking glasses smash when thrown

* Maintains bartender snowflake behavior

* Extended to all bottles, cartons, cleaned up 1 & 0

* Corrected breaking bottles on heads.

* Reduced glass spawn chance to 33%
2017-11-20 09:45:08 +01:00
kevinz000
beb255dbf1 Refactors uplinks to a component 2017-11-20 00:13:26 -08:00
kevinz000
caa1e1f400 Massive research refactor; changes research system to techwebs; Decentralized research 2017-11-18 19:55:40 -08:00
Jordie
8b19b490d1 JSON feedback (#32188)
* wip

* wip2

* makes code actually compile on 511 + fixes

* versioning

* s

* adds python conversion script, schema change and removes 'force ' from item_used_for_combat

* fix to compile

* forgot to actually commit this
2017-11-17 02:43:12 -05:00
arsserpentarium
bdfbafd54a [READY]integrated circuitry port+upgrade. (#32481)
* first

* printer, tools, prefab, assemblies, power.dm(looks like so)

* integrated circuit

* input memory epv2 exonet node

* input,manipulation,output,poweract

* fixes

* reagents fix

* time

* minor fixes

* all errors fixed

* bugfixes

* prefab, tickers, camera, led, assembling bugs,

* All except exonet node UI and led's

* cameras, led and some exonet

* 11

* 111

* lesser fixes.

* botanic shit

* icon

* nobludgeon for debugger

* gui, typos

* gui, typos

* dopil

* smaller diff, rm template and node

* mergefix

* list fix

* weakrefs

* fixes

* Clamp, crowbar, minor shit

* fukken refs

* exonet node refactor, put defines into defines.

* dme upload

* defines,helpers,exonet node, botanic

* TRUE/FALSE and minors

* datumfix

* moved init to ss

* quickfix

* cryo runtime fix

* datums quickfix

* admins

* minor fixes

* fixes

* refs,tools

* printer

* fixes

* fixes

* check interactivity redo.

* usercheck, fixes

* weakrefs

* T/F

* WEAKREF

* unfuckup

* fixes and shit

* Update assemblies.dm

* crypto

* fuck

* SS, final fixes

* looks like final fixes.

* release,crypto, ranged scnner

* defines

* Resets some files

* find/replace

* Associative addresses

* Update exonet_node.dm

* push

* there we go

* fix

* FINISH!

* WEAKREFUCK

* FixeS

* Woops

* Woops

* woops

* fix

* fixes

* loops

* fix or break?

* fix,dammit!

* fix,dammit![2]

* fix,dammit![3]

* disconnect

* fix

* input

* lag

* pin

* map

* sdegsds

* >>>lights

* fixes le map

* makes circuits actually speak

* halffix

* resets maps to tgstation master

* typeless loops in init

* Changes subsystem to not initialize new types and use initial instead.

* fix

* trying to get rid of obj list.

* get rid of .

* Better code makes better mind

* fixed

* pin fixes

* fix

* compiled tgui

* circuits config

* spelling
2017-11-14 04:05:22 -05:00
nicbn
3cfe9eab43 Makes cryoxadone heal clone damage again 2017-11-13 20:31:15 -02:00
nicbn
eae3d10cfc Cryo rebalance (#32565)
* Cryo rebalance

* performance, generic overlay

* No more space change

* oops i used commas instead of dots

* Update cryo.dm

* fukkin github

* Update cryo.dm
2017-11-13 14:11:05 -05:00
Ashe Higgs
5946689f10 Improves the deep fryer (#32482)
While I was messing with vitamins and nutrients, I decided to touch up on deep fryers as a separate project. A demo of sounds can be found here, using the looping sound framework added recently. Also, sound quality in the video is kind of terrible; it sounds much nicer in-game.

Fryers themselves now use the cooking oil reagent, which is new and can be obtained by grinding soybeans (for vegetable oil) or meat (for oil derived from fats.) This does include synthmeat, which you can also use for meat anyway! By default it takes about 1.2 units of oil to fry one object.

Also adds oil_use and fry_speed vars that determine how well the fryer does its job. These values start at ~0.04 and 1 respectively, and can be brought to 0.01 and 4 with max-tier parts (each fryer uses one micro laser.)

Cooking oil itself can be heated to 450 K to bring out its latent frying powers. When splashed on object, it will fry them instantly (albeit inefficiently)... and can also fry humans and other creatures rather painfully.
2017-11-13 22:15:07 +13:00
AnturK
b1051ae506 Fixes stimulum decay (#32597)
* Fixes stimulum decay

* Nitryl too

* This too.

* Makes stimulum actually apply it's anti-stun changes.
2017-11-13 10:32:19 +13:00
Emmett Gaines
0f0d39ebff fixes 512 compile reminders (#32582) 2017-11-11 21:32:10 +01:00
Leo
e23451a09c Merge pull request #32560 from Mark9013100/11/9/17_char_antitox
Renames charcoal bottles
2017-11-10 13:09:47 -02:00
ShizCalev
179e653562 Adds icons for items with randomization (#32523)
* Adds icons for items with randomization

* Glowsticks

* added ?

* more question marks

* Loc
2017-11-10 00:23:10 -05:00
Mark9013100
dc21d75fc2 Renames charcoal bottles 2017-11-09 10:22:16 -05:00
swindly
1ef9667358 Generalizes some reagent heating (#32461)
* adds expose_temperature

* changed chem_temp change

* returns ..()

* removed redundant handle_reactions()
2017-11-08 12:04:33 -05:00
AnturK
70d0357b33 Ling datum antag standarization. (#32183)
* Ling datum standarization.

* Removal of redundant file

* Ok
2017-11-05 20:32:37 -05:00
Tad Hardesty
9fb288a601 Fix a few syntactic aberrations (#32284) 2017-11-02 03:21:14 -06:00
nicbn
34bd538bcf Rename brown gas to nitryl (#32271) 2017-11-01 15:00:59 -06:00
FrozenGuy5
ec8582d64d Nerfs smoke machine + improves grammar (#32196)
* https is the way to go

* changes links to https:// instead of http://

* tsk tsk byond

* Nerfs smoke machine + improves grammar

* requested changes

* i can spell
2017-11-01 09:18:22 +13:00
vuonojenmustaturska
6d8681f9e0 Deterministic output slots for smartfridges (#32225)
* a spooky commit

* It is too late, the skeleton is already inside you

* mexican river dolphins for halloween 2018

* Compiler warnings for halloween 2018
2017-10-30 15:34:28 -04:00
PKPenguin321
fc92519d45 Fixes filling smoke machines with pills (#32140)
Fixes #32102

Checks for the OPENCONTAINER flag after seeing if the object being used to fill the smoke machine has reagents in it
2017-10-30 10:00:32 +13:00
Emmett Gaines
825ab4def4 [512] The great \ref purge (#31824)
* The great \ref purge

* cleanup
2017-10-28 17:20:04 -04:00
Jordan Brown
5dde2e3c84 Merge pull request #31864 from ninjanomnom/thermite
Makes thermite a component
2017-10-27 18:35:36 -04:00
Anonmare
e57e86c3c8 Adds some new grindables to the grinder (#32107)
* Adds some new grindables to the grinder

* Update reagentgrinder.dm

* Update reagentgrinder.dm

* Update reagentgrinder.dm

* Update reagentgrinder.dm

* Update reagentgrinder.dm

* Update reagentgrinder.dm

* Update reagentgrinder.dm

* Update reagentgrinder.dm

* Update reagentgrinder.dm

* Update reagentgrinder.dm

* Adds the extra ")"

* Update reagentgrinder.dm
2017-10-27 18:29:53 -04:00
Emmett Gaines
65606195a7 More radiation balance changes and fixes (#32051)
* more balance changes and fixes

* cleanup
2017-10-27 10:06:59 +02:00
as334
43edaedc29 Assmos part 1, #2 (#30791)
* First part of Assmos

* Adds tritium synthesis and basic in-body effects.

* Begins adding the higher tier gases. Removes Freon(not completely yet) adds new gases to scrubers. Fixes some dumb bugs.

* Whoops

* Adds effects and synthesis reactions for pluoxium and stimulum

* Kills Freon.

* Adds sprites

* Removes the magic numbers

* Hyper-Nobelium formation

* Removes Freon from maps.

* Initial Dunc Review changes

* Should ACTUALLY fix the maps this time.

* Dunc Final Review

* Debugging part 1

* Fixes brown gas synthesis

* Auto stash before merge of "assmos-pathconflicts" and "origin/master"

* fix compile errors

* Moves defines. Fixes stimulum coefficents.

* Reworks how Stim and brown gas work, adds tritium to tile fires, fixes a lot of general reaction bugs.

* fixes typo

* Hopefully fixes UI

* compiles tgui

* Tritium balance.
2017-10-26 22:11:56 -06:00
KorPhaeron
ad30af5dec Vampire species for halloween (#32096)
* Vampires

* Action name

* Cooldown so you can't queue drains

* Blood drain rate

* Vampire cleanup/additional checks

* Vampires can drink blood (reagent) (#30)

* New DRINKSBLOOD species_trait

All species can drink blood, but species with this trait
will restore lost blood_volume when drinking it

* Vampires have vampire blood and DRINKSBLOOD

People with vampire blood can take all other blood
Vampire blood can't be used for anyone that doesn't have it

* Vampire tweaks (#31)

* Universal Blood

* Removes spell on species loss

* Vampire heart for checking blood level
2017-10-26 12:54:54 -04:00
ninjanomnom
52d45cf0e8 makes thermite a component 2017-10-26 01:55:37 -04:00
kevinz000
30afe783d5 fixes pentetic acid dealing radiation damage instead of healing it (#32027)
* Update medicine_reagents.dm

* sorry i alughed so hard i hit a key
2017-10-24 10:54:06 -05:00
vuonojenmustaturska
6ced8a1ae7 Fixes grinders (#31885)
* But you're still hungry

* Update reagentgrinder.dm
2017-10-23 15:21:57 +02:00
Marc R. Uchniat
5934339be9 switch smoke machine general logging from admin to game log, where it should be -- i missed this when i added the message_admins call 2017-10-20 18:21:08 -05:00
Robustin
749fb6b2ce Spraytan Nerf 2017-10-20 18:20:45 -05:00
Emmett Gaines
d17d09cb1b Radiation makes you vomit blood and more balance changes (#31753) 2017-10-18 10:24:09 -04:00
Leo
6657b4edeb Merge pull request #31839 from ShizCalev/networked-fibers-grammar
Rewords networked fibers description
2017-10-18 10:22:31 -02:00
Leo
c1450bbdc1 Merge pull request #31809 from ShizCalev/helper-cleanup
Cleans up some istypes not using helpers
2017-10-17 22:20:42 -02:00
Robustin
e137a49b70 Smoke Machine Fixes (#31806) 2017-10-17 13:33:44 -04:00
ShizCalev
f36540a2cb Rewords networked fibers description 2017-10-17 04:24:47 -04:00