Commit Graph

665 Commits

Author SHA1 Message Date
Leo 28801ac5db Merge pull request #34360 from kevinz000/patch-429
Fixes clownborg sprays not recharging
2018-01-13 17:25:07 -02:00
kevinz000 aca01e3553 Update spray.dm 2018-01-12 06:37:37 -08:00
ShizCalev c4496dbd72 Consolidates bot assemblies under one parent 2018-01-07 13:43:46 -05:00
kevinz000 6ce550dadf Clownborgs (#33590) 2017-12-22 11:57:02 -05:00
ACCount 40699a8aea [READY]Refactors reagent container types (#33470)
* Replaces a bunch of manual OPENCONTAINER checks with helper procs

* Removes unnecessary vars

* Updates reagent bitflags, adds some new ones

* Replaces most of the is_open_container calls with more specific ones

* Puts new AMOUNT_VISIBLE flag to use

* Uses new helper procs in more objects

* Standardizes chemicals logging

* De-snowflakes two more checks

* Fixes

* Minor fixes and improvements
2017-12-18 22:55:01 -06:00
Emmett Gaines 25080ff2c4 defines math (#33498) 2017-12-17 11:02:11 -05:00
Ashe Higgs d447acdc6e All-In-One grinder results are now defined by type, not by huge lists (#33181)
I had some time free, and noticed how awful the reagent grinder code was - it used huge static lists containing types and their associated reagents from grinding.

This is now split into two new vars on /obj/item - var/list/grind_results and var/list/juice_results, as well as two new helper procs, on_grind() and on_juice() to allow those to change based on conditions like plant potency. Such checks and the like have been moved to that. If any of these procs return -1, the operation is canceled.

I also fixed some of the recipes that didn't work. The reagent IDs for them didn't exist, leading me to believe that they weren't tested. I corrected that! (I've tested every single recipe in this PR, with the exception of a few juicing-related ones.)
2017-12-15 10:48:25 +13:00
coiax e7e33b3004 Silver slime extract foods now fry correctly (#33309)
* Silver slime extract foods now fry correctly

The invocation to create fried food wasn't correct, and was ending up
creating fried food that had the default name and description.

- Also adds a "syringe/plasma" type, because it's annoying having to
spawn in plasma sheets and grind them and then put them into a syringe,
if you want to test slime spawning stuff.

* Contains
2017-12-10 18:41:59 -05: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
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
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 caa1e1f400 Massive research refactor; changes research system to techwebs; Decentralized research 2017-11-18 19:55:40 -08: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
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
Tad Hardesty 9fb288a601 Fix a few syntactic aberrations (#32284) 2017-11-02 03:21:14 -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
vuonojenmustaturska 0616b8406e bottle sprite stuff 2017-10-15 23:59:54 -05:00
kevinz000 b83d777119 Removes a bunch of sleeps/spawns and makes a few booleans defines (#31553)
* spawn/sleep removal part 1

* sleep/spawn/src. removal

* fixes type paths in timers

* Fixes some variable passing

* Why do I have to do this 20 times to get it right..?

* Why do I have to do this 21 times to get it right..?

* Update suicide.dm

* Update software.dm

* Update paper.dm

* Update cable.dm

* Update ninjaDrainAct.dm

* Update hypospray.dm

* Update vocal_cords.dm

* Update touch_attacks.dm

* Update revenant_abilities.dm

* woops

* Update revenant_abilities.dm
2017-10-14 19:53:17 -04:00
vuonojenmustaturska ca533a4447 Removes useless commented-out what-if code from the 1970s 2017-10-07 15:33:09 +03:00
Tad Hardesty 5a0bb2f599 Grammar fixes to atom descriptions (#31293)
* Grammar fixes to atom descriptions

- Capitalization and punctuation on most descriptions
- CentCom instead of centcom where appropriate
- Earth instead of earth where appropriate

* Remove spaces before newlines and oneline some strings
2017-10-05 16:33:35 -04:00
Firecage ee3e8d2846 merge conflict fix 2017-10-05 11:22:57 +02:00
Firecage 2ae0380fef Does some code standardization/consistency 2017-10-05 11:13:47 +02:00
oranges eda8f7f7df Log attempted injections as well as successful ones 2017-09-29 15:57:13 -05:00
Firecage a937eccb8b Fixes it so patches do not work on robotic limbs. 2017-09-18 05:22:47 +02:00
kingofkosmos a479714b5f Adds missing span-endings (#30494)
* Adds missing </span>'s.

* ".name]" --> "]" and
"to_chat(GLOB.admins," --> "message_admins("
and one [name] --> [src]

* Earlier commit was a mistake, lesson learned

* Hopefully all is ok now.

* Revert "Hopefully all is ok now."

This reverts commit 3c95e41b4c13ce96469861e9a97453adf4b56826.

* Revert "Earlier commit was a mistake, lesson learned"

This reverts commit d611af1e4a76690453a7f9808b6e2c429b679f6c.

* Revert "".name]" --> "]" and"

This reverts commit d538b9efef2d7d8be9122bf5ceaf105055059bc6.

* message_admins fix
2017-09-11 14:09:53 +02:00
Cyberboss c76c50a98b Merge pull request #30113 2017-08-26 11:35:14 -04:00
shizcalev 3010674b8b Adds magillitis, a toxin which gorillas monkies 2017-08-24 15:47:12 -04:00
shizcalev 892fc79c6b Replaced 0 for container_type with NONE define 2017-08-23 17:19:52 -04:00
XDTM 28a5901170 You can now click on symptoms in the Pandemic to see their description and stats (#29866)
* You can now click on symptoms in the Pandemic to see their description and stats

* Threshold info

* NO WHITESPACE
2017-08-19 19:52:09 -04:00
Ian Turk 7460f2c5b8 Replaced flags with flags_1 2017-08-16 13:01:15 -06:00
Jordan Brown af4d9a85c9 Repaths /obj/item/weapon to /obj/item (#29929) 2017-08-16 10:38:51 -03:00
kingofkosmos e75d8b9a6f Adds inhand sprites for DRAGnet and Chemical Sprayer, fixes One-point manipulator's in hand. 2017-07-30 18:58:09 +03:00
Cyberboss 1acd7fe210 Merge pull request #29555 2017-07-29 20:41:03 -04:00
ShizCalev d525b18d8d Completes major inhand split project (#29574)
* Completes split project

* More work on it. Should be more or less finished
2017-07-29 16:47:37 -03:00
Xhuis 381082066d Fixes syringe injection not working 2017-07-28 11:16:06 -04:00
ShizCalev 45d3d52af7 Made some object lists less terrible to read (#29304)
* spaces

* more spaces

* last ones
2017-07-18 10:44:29 -04:00
XDTM 7de5bde68e [Seriously, it's ready]Virology Rework: The Thresholdening (#28556)
🆑 XDTM
experiment: Viruses and symptoms have been havily reworked.
add: Symptoms now have statistic thresholds, that give them new properties or improve their existing ones if the overall virus statistic is above the threshold. Check the pull request in github or the wiki (soon) for the full list.
del: Some symptoms no longer scale linearly with stats, and instead have thresholds.
tweak: The symptom limit is now 6.
del: Viruses can no longer be made invisible to the Pandemic
tweak: Symptoms no longer trigger with a 5% chance every second, but instead have a minimum and maximum number of seconds between each activation, making them more consistent.
del: The symptoms Blood Vomit and Projectile Vomit have been removed, and are now bonuses for the base Vomit symptom.
del: The Weakness symptom has been removed as it was completely useless.
tweak: The Sensory Destruction symptom has been reworked into Narcolepsy, which causes drowsiness and sleep.
tweak: Viral Aggressive Metabolism now has a timer before it starts decaying the virus. It scales with the highest between Resistance or Stage Speed.
add: You can now neuter symptoms, making them inactive. They will still affect stats. Adding formaldehyde to a virus will neuter a random symptom. A bottle of formaldehyde starts in the virus fridge.
/🆑

Full list of threshold bonuses:

    Facial Hypertrichosis - None
    Choking
        Stage Speed 8 : Acts more often
        Stealth 4: Suppresses early warnings
    Acute respiratory distress syndrome
        Stage Speed 8: Adds paralyzing chems (removed from base version)
        Infect 8: Stronger damage
    Confusion
        Stealth 4: Suppresses early warnings
        Resistance 6: Also deals some brain damage, not above 80
        Infect 6: Stronger confusion
    Cough
        If AIRBORNE: Coughing causes a spread at range 1
        Resistance 3: Coughing drops small items (removed from base)
        Resistance 10: Can cause coughing fits that stun briefly
        Speed 6: Increases cough frequency
    Deafness
        Stealth 4: Suppresses early warnings
        Resist 9: Deafness is permanent instead of temporary
    Dizziness
        Stealth 4: Suppresses early warnings
        Infect 6: Also adds the druggy effect
    Fever
        Resist 5: Heats more, can go above the damage threshold
        Resist 10: Heats even more per activation
    Shiver
        Speed 5: Cools more, can go below the damage threshold
        Speed 10: Cools even more
    Spontaneous Combustion
        Stealth 4: Suppresses early warnings
        Speed 5: Increases fire stacks and damage
        Speed 10: Increases fire_stacks and damage even more
        Infect 8: Spreads the virus when igniting
    Alkali Perspiration
        Resist 9: Increases time between ignitions but increases power as well
        Speed 8: Doubles the explosion range when wet
        Infect 8: Also adds napalm and clf3 (removed from base version)
    Necrotizing Fasciitis
        Resist 7: Causes extra bleeding
        Infect 8: Deals additional stamina damage
    Autophagocytosis Necrosis
        Stealth 5: Suppresses early warnings
        Speed 7: Adds Heparin and Lipolicide (removed from base version)
        [PROPOSED REQUESTING APPROVAL] Infect 13: Adds romerol, turning the victim into a zombie on death.
    DNA Saboteur
        Stealth 5: DNA won't reset after curing
        Speed 10: Increases mutation frequency
        Resist 8: Mutate twice instead of once
    Hallucigen
        Stealth 4: Suppresses early warnings, and gives off the messages of positive symptoms instead
        Speed 7: Stronger hallucinations
    Headache
        Stealth 4: Reduces early message frequency
        Speed 6: Deals some stamina damage when headaching
        Speed 9: Reduces frequency, headaches are strong enough to stun
    Healing Symptoms
        Stealth 4: Hides the overlay when healing
        Speed 7: Increases healing rate
        Speed 15: Further increases healing rate
    Itching
        Infect 6: Increases frequency
        Speed 7: Itching causes scratching, dealing minor brute damage (0.5)
    Narcolepsy
        Infect 7: Deals stamina damage when it triggers
        Resistance 10: Triggers more often
    Self-Respiration
        Resist 8: Regenerates blood
    Sensory Restoration
        Resist 6: Also heals brain damage (removed from base)
        Infect 8: Also purges alcohol (removed from base)
    Sneezing
        Infect 9: Increases spread range
        Stealth 4: Suppresses early warnings
    Hyphema
        Stealth 4: Suppresses early warnings
        [REQUESTING APPROVAL] Resist 13: Eyes fall off instead of just being blinded
    Voice Change
        Stealth 3: Suppresses early warnings
        Speed 7: Changes voice fater
        [REQUESTING APPROVAL] Infect 14: Changes the infectee's language along with the voice
    Vomit
        Stealth 4: Suppresses early warnings
        Resist 7: Blood Vomit
        Infect 7: Projectile Vomit

Unlisted symptoms do not have threshold bonuses!

All balance is not final, i'll tweak the numbers as necessary.
Why

Threshold bonuses: The reasoning behind these is that they feel more rewarding and impactful than simple number scaling, and gives the option to dedicate symptom space to more symptoms or to upgrade a few central ones instead.
Symptom activation change: the intention behind this is RNG consistency and ease of balance. Currently all symptoms have a 5% chance of activate with few exceptions, making it complicated to tweak.
Neutering: Upgrading positive symptoms by putting a ton of negative ones doesn't work well, in my opinion, especially when they'll trigger their own thresholds making the virus somewhat dangerous instead. Neutering allows players to sidestep that, but i recognize that it swings a bit too far on the other side of the risk/reward balance. I plan on finding a better system to manage virus statistics in the future.
2017-07-14 09:42:56 +12:00
ShizCalev 59ef81245b Changes some 1s and 0s to TRUE and FALSE (#29144) 2017-07-10 10:31:34 -04:00
kevinz000 b3a5e27369 Update hypospray.dm (#29139) 2017-07-09 08:43:18 -03:00
kevinz000 01e39d19fd Replaces all instances of spawn() with addtimer/INVOKE_ASYNC (#28958)
* spawn removal

* missed a rp

* missed a var

* vars

* stuff

* ok

* Update disposal-unit.dm

* Update disposal-structures.dm

* Update tooltip.dm

* Update experimentor.dm

* Update disposal-unit.dm

* Update experimentor.dm
2017-07-06 10:13:44 -04:00
Really-Good-Soda-Flavor 930b15e625 Adds container types INJECTABLE and DRAWABLE (#28853)
* Adds container types INJECTABLE and DRAWABLE

* Make the chemistry readme a text file and updates it!

* Unfucks the readme!

* Another attempt at fixing the readme

* Remove the readme from the .dme

why was it a dm file!!
2017-06-27 09:19:25 -04:00
Steelpoint f8ee37afc0 Ancient Space Station [Space Spawn Ruin] (#28584)
* FirstCommit

* HardsuitAncientSounds

* FurtherWorkSave

* HivebotSpriteMinorMapChange

* FinalFixesPrePR

* MinorFixes

* FixesPart1

* TGMMap

* Wording

* VoidSuitPlusSpelling

* TGMConv

* MoreSpelling

* RadioStorm

* SomehowGotThisToWork
2017-06-25 12:02:31 -04:00
nicbn 77a2d3f5cd Replaces "istype"s with is_helpers macros (#28676) 2017-06-22 15:03:19 -03:00
Expletive b66ed15f09 Legion corpses have equipment. Rarely their equipment is useful. 2017-05-31 00:06:05 -07:00