Commit Graph

2301 Commits

Author SHA1 Message Date
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
ShizCalev 721df8dacf Cleans up some istypes not using helpers 2017-10-16 15:30:30 -04:00
AnturK 5f0ef140e8 Mutadone in monkeys runtime 2017-10-16 10:44:22 +02:00
vuonojenmustaturska 0616b8406e bottle sprite stuff 2017-10-15 23:59:54 -05:00
Jordan Brown 04c05d8e5c Adds defines for organ slots (#31737) 2017-10-15 20:33:35 -04: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
Emmett Gaines 9d17e9c102 Fixes camera mobs becoming contaminated and other tweaks (#31731) 2017-10-14 19:39:51 -03:00
vuonojenmustaturska 3fac6440bd Allows mobs to get shocked when they smash things (#31677)
also fixes an unrelated runtime involving magillitis
2017-10-14 16:18:07 -04:00
Armhulen 1673ed22ad OK THERE
FUCK MAN
2017-10-13 19:30:31 -07:00
Robustin c353b77f4e Smoke Machine Updates & Fixes (#31598)
* Smoke Machine Update

* Update smoke_machine.dm

* Compiling again
2017-10-13 15:49:24 -06:00
Jordan Brown 963fc6b4ae Merge branch 'master' into patch/thethe 2017-10-13 10:23:55 -04:00
Emmett Gaines 456cd10d94 Radiation rework and subsystem (#30909)
* radiation rework and subsystem

* moves a few things to initialize and adds radiation insulation

* adds a radiation contamination mechanic and makes requested changes

I'm terrified by the possibilities from this

* radiated objects give off light

and hopefuly contamination is balanced

* fixes runtimes and an mc crash kek

removed the lighting part of contaminated objects
attempted some more balancing

* Collectors output power in process() gradualy

And some more balancing tweaks

* Excludes a bunch of things from becoming radioactive

* Ready for testmerge balancing

* Inverse square law was swapped

* testmerge balancing

fixes the geiger counter
buffs collector power gen
nerfs sm radiation
slightly buffs rad insulation
nerfs rad damage (and its burn)
raised the minimum radiation

* disabling the radiation subsystem won't build up rad wave datums forever

* rewrites how mobs handle radiation

upgrades geiger counter functionality
and more balance tweaks

* cleans up stuff and removes debug message

* Slight contamination buff

* Major rad wave performance boost

Also improves rad insulation
Buffs contamination, again

* Fixes insulation runtime

More balance and performance tweaks

* fixes rad collectors not receiving power

* The final balance commit

Fixes a major bug causing radiation to underperform
More geiger counter changes that will be changed more to add sounds

* Monkey business

* Geiger counter sounds

* cleanup and move components to their own initialize

* Some code cleanup

And forgotten changes

* Cleans up some trailing returns

* Mapping changes
2017-10-13 10:22:00 -04:00
Tad Hardesty c1794bb402 Fix many instances of "the the"
All uses of "the [src]" have been fixed, as well as other bad string
interpolation directly adjacent to such uses.

In addition to its message, the circumstances under which the tracking
implant locator fails have been updated to use the correct define,
malfunctioning on CentCom rather than on the station.
2017-10-11 21:55:44 -07:00
Marc Uchniat e977392c22 implement message_admins for smoke machine activation 2017-10-11 16:27:35 -04:00
kevinz000 7d19b2a678 Fixes pandemic no beaker UI runtime (#31443) 2017-10-10 14:48:07 -04:00
Robustin 62fe4eb93d Adds the Chemistry Smoke Machine (#30920)
* Smoke Machine

* Tweak

* More responsive smoke timing

* Antur Review and Admin Logs

* Cboss review

* More logging

* Removes analyze, streamlines logs

* r-e-a

* no s in reagents_list

* Cyberboss Review

* woops

* Cboss nitpicking
2017-10-10 14:12:40 -04:00
kevinz000 3d39ad3501 Allows you to choose how much to insert into protolathe/exofab/circuitprinter/dronedispenser (#31399)
* precision

* precision

* sanity checks

* itt kevinz doesn't know how cyberboss procs work

* fixes

* allows user cancellation

* im dumb

* itt: im still dumb

* fixes stuff, makes it set on init

* refactors reagentgrinder code

* more fixes, prevents melee attacks from going anyways

* ...? wtf is with usetopic

* Finally found out what's wrongw ith this thing.

* fixes a mistake
2017-10-10 21:11:22 +13:00
Tad Hardesty 13f32a938b Improve extended examination text for many objects (#31381)
Plurality, capitalization, punctuation, and item icons have been
improved. Status displays now show the same text on examination that
they do visually. Inducers only show a success message when they
actually succeed.
2017-10-10 21:06:46 +13:00
XDTM db0c10ea58 Refactors virus spreading (#31066)
* Refactors virus spreading

* Cyberfixes

* Bump to infect

* proper shoe protection

* Split ContractDisease

* Makes virus severity matter

* oops

* Virus severity changes

* defines

* infective_floor --> infective

* Fixes vomit and pulling infection
2017-10-09 14:08:21 +02:00
Jordan Brown 0603ad4db0 Merge branch 'master' into codejanitoring 2017-10-07 14:53:43 -04:00
Jordan Brown b6d349e1d4 Remove drop_item, drop_item_v, put_in_hands_or_del (#31386) 2017-10-07 13:36:33 -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 b8ea267866 Merge pull request #31281 from vuonojenmustaturska/clowncult
Removes /datum/reagents/process(), changes cryostylane & pyrosium reaction speed
2017-10-05 11:54:45 +13:00
Jordan Brown 32050bed01 Moves laughter to the emote (#31276) 2017-10-04 13:19:18 -04:00
vuonojenmustaturska f85d057593 Flat out removes /datum/reagents/process(), a top-5 proc by call volume 2017-10-03 23:29:04 +03:00
oranges eda8f7f7df Log attempted injections as well as successful ones 2017-09-29 15:57:13 -05:00
oranges 5260bd97c7 Merge pull request #31064 from YPOQ/silverfriedfoods
Silver slime extracts create proper fried foods
2017-09-29 15:55:02 +13:00
YPO 2587535ccf Silver slime extracts create proper fried foods 2017-09-27 13:41:21 -06:00
AnturK 292638c209 Specifies one format of variable declaration for the codebase. (#30926)
* Removes occurences of var name

* Contributing note

* note fixup
2017-09-22 13:43:52 -04:00
oranges d7b48a9d31 Merge pull request #30851 from Firecage/nopatchesonnonorganiclimbspleaseandthankyoumistergoof
Fixes it so patches do not work on robotic limbs.
2017-09-22 17:32:12 +12:00
oranges 3791f0b443 Merge pull request #30896 from ShizCalev/debug-text
Removes old debug text
2017-09-21 23:29:29 +12:00
ShizCalev c06c63662b Makes magillitis affect all Hominidae. (#30841) 2017-09-20 09:05:03 -05:00
ShizCalev 39380d5b03 Removes old debug text 2017-09-19 18:56:39 -04:00