Commit Graph

2428 Commits

Author SHA1 Message Date
Hinaichigo
7b6bca63c7 Update grown.dm (#32710) 2022-05-30 01:17:30 -05:00
SECBATON GRIFFON
612d7968f6 We have you surrounded, come drink your corn syrup (#32594)
* We have you surrounded, come drink your corn syrup

* Makes this work with recipes

* Now in dansnacks

* Now in dansnacks

* actual sugar in sugar blast again

Co-authored-by: SECBATON GRIFFON <sage>
2022-05-30 01:16:29 -05:00
Eneocho
5edda1ef18 Update grown.dm (#32694) 2022-05-27 23:56:11 -05:00
SECBATON GRIFFON
1827dd336d Suicide act improvements sans controversy (#32666)
* Suicide act improvements sans controversy

* Leaving alone for now

* New way

* New way

* Covered by this anyways

Co-authored-by: SECBATON GRIFFON <sage>
2022-05-27 11:29:13 +02:00
Hinaichigo
f23f027a38 Slot machines influenced by luck, scratch cards less influenced by luck, & made luckier clovers rarer. (#32670)
* Slot machines influenced by luck & made luckier clovers rarer.

* Simplify.

* Nicer logic.

* Update lotto.dm

* Update lotto.dm

* Update slot_machine.dm

* Tweak.

* Update slot_machine.dm

Harder slots

* Update lotto.dm

Harder lotto.

* Update lotto.dm
2022-05-26 11:39:21 -05:00
Hinaichigo
ab4473e9fe Various, primarily muzzle-related tweaks and fixes. (#32668)
* Various changes.

* Fixes.

* Update code/_onclick/hud/screen_objects.dm

Co-authored-by: DamianX <DamianX@users.noreply.github.com>

* Update inventory.dm

Test

* Hmm..

* Update inventory.dm

Re-add invocation.

Co-authored-by: DamianX <DamianX@users.noreply.github.com>
2022-05-26 10:05:40 +02:00
kane-f
0c454ade78 Rudimentary thrown food and drink targeted reagent reaction (#32634)
* Rudimentary thrown food and drink targeted reagent reaction

* More sanity

Co-authored-by: kanef <kanef9x@protonmail.com>
2022-05-23 01:27:35 -05:00
Hinaichigo
43cea7901f Rags as ghetto muzzles & muzzle tweaks (#32628)
* Biting and kicking while handcuffed.

* Rags as ghetto muzzles and vampires not being able to bloodsuck while muzzled.

* Update click.dm

revert from another PR

* Update other_mobs.dm

* Update footprints_and_rag.dm

* Update human_defense.dm

* Update stripping.dm

* Update items.dm

* Update examine.dm

* Update examine.dm

* Update items.dm

* Rag in the mouth sprite.

* Change ingestion rate.

* .

* Muffled speaking with a rag in the mouth.

* Fix capitalization bug.

* Rags can't be equipped by mouthless creatures.

* Fix radio bug.

* Non-oral languages not being muzzled.

* Lollipops.

* No eating while muzzled.

* Update snacks.dm

* Check for slot for message when putting a goes_in_mouth item on someone.
2022-05-23 01:24:16 -05:00
Hinaichigo
65918d5380 Luck (#32519)
* Luckiness.

* More changes.

* Luck scaling function.

* Remove debug residue.

* .

* Perhaps this will work.

* Mime vow-breaking curse.

* Rabbit foot.

* More work on clovers.

* .

* Clover mechanics.

* New clover sprites.

* Moved some things to their proper locations and neatened up.

* Add clover seeds to the seed vendor.

* Shuttle console kicking. Fixed overflow bug.

* Eating clovers.

* Want to check linters.

* Reintegrated nonmutated clover spawning.

* Luck and potency based clover harvesting.

* Rad storm considerations.

* Clover sprites and plant params.

* Neatening up.

* In case.

* Changed luck calculation.

* .

* Added precalculation of luck.

* .

* Change loop types. Reorganization and comments.

* Fix aliasing bug.

* Change description comment.

* .

* .

* Decreased clover nutriment.

* Comment tweak.

* Changed clover leaf probs.

* .

* One more thing.

* Moved update_leaves() to initialize(). Added more mirror shattering cases.

* Update hydroponics_mutations.dm

* Update grown.dm

Tweak clover probabilities.

* Update grown.dm

* Update grown.dm

* Update grown.dm
2022-05-23 00:49:40 -05:00
kane-f
8641aa91af Hiding tiny items under floortiles (#32566)
* Hiding tiny items under floortiles

* Using levels so T-ray scanners work with them nicely

* Not when these are present

* T-ray scanners now work properly

* Looot of sanity checks, except some amusing ones

* Airflow sanity fix

* Inheritance rework

* Fix 1

* Fix 2

Co-authored-by: kanef <kanef9x@protonmail.com>
2022-05-17 14:55:01 -05:00
adacovsk
b63bc16662 Refactoring Invisibility and Transparency for specific objs and mobs (#32596)
* refactoring

* refactorin

* Update mob.dm

* Update mob.dm

* refactor

* Update horror.dm

* all done

* Update carbon.dm

* Update potions.dm

* Update potions.dm

* Update objs.dm

* more

* fix vampire invisibility

* Update cosmetics.dm

* fixed

* Update update_icons.dm

* Update update_icons.dm
2022-05-17 12:16:10 -05:00
kestoloppu
b14bdf37a7 Updates insectoid monkey form (#32569)
* Updates insectoid monkey form

* Insectoid monkey cube consistency update

Changes description of insectoid monkey cubes from "roach" to "isopod".

* Insectoid monkey cube path consistency update

Changes pathname for insectoid cubes from "roachcube" to "isopodcube"

* Fits hats, masks, and backpacks to insectoid monkey form
2022-05-15 10:20:19 -05:00
kane-f
326a22f54f Removes reagent targeting from thrown drinks (#32571)
Co-authored-by: kanef <kanef9x@protonmail.com>
2022-05-14 19:44:27 -05:00
Eneocho
0823f6a758 Update Chemistry-Reagents.dm (#32570) 2022-05-10 03:01:53 -05:00
Hinaichigo
e0fc50d030 Flipping chocolate coins (#32555)
* Flipping chocolate coins.

* Change equipping behavior.

* Flippable candy coins.

* .

* Use defines.

* Change to component.

* remove 'as'

* Fixed coin orientation reset upon equipped().

* Update coinflip.dm

remove comment

* .

* Changed iscoin() to isitem().
2022-05-10 04:54:39 +02:00
Hinaichigo
61841f7cda Roundstart Blood Supply Nerf (#32504)
* Update smartfridge.dm

Add AB+ and AB- bloodpacks to blood bank.

* Update blood_pack.dm

Add AB+ and AB- blood packs.

* Update smartfridge.dm

Reduce number of blood packs per fridge.

* Update smartfridge.dm

Remove AB packs and add more empty packs at roundstart

* Update supplypacks.dm

Add two more empty bloodpacks to supply pack.
2022-05-07 22:37:23 -05:00
Optimism333
a16e41020a Mothership Lab Vault & Broke UFO Less Broke (#32406)
* Mothership_Lab_Draft

* tiny_namechange_request

* added_bosses_to_globaldm

* Added_Some_Missing_Lights

* Fixed_Spriting_Inconsistency

* more_lights_and_some_gun

* renamed_botanist_locker

* Added_Advanced_Disintegrator

* tweaked_advdisintegrator_shotcharge_value

* tweaked_again

* da_last_bawss

* fixes

* added_new_bawss_to_global

* fix

* research_deck_bawss_area_update

* added_phase2_to_global

* nurseboss_viewbuff_voxboss_healnerf

* added_nu_raidertype

* tweaks_to_greyboss_name

* nerfed_greyheavy_health_slightly

* Fixed_Invisible_Helmet

* map_updates_and_fixed_ladder

* trimmed_some_code

* nerfed_pacifier_stun_duration_slightly

* ayy_heavy_helm_human_wearable

* some_fixes_balance_and_better_math

* new_bawss_ability_and_some_balance

* cleaned_up_robit_code_and_fixes

* vox_assassins_remember_the_basics

* whoops

* shorter_sweep_desc

* less_banger_chance

* squishes_runtime_fukuIwin

* rebalanced_hoverdisc

* some_further_tweaking

* woop

* expanded_raider_tunnel

* deflection_message_tweak

* rebalanced_grey_jumpsuit_values_slightly

* some_mapping_and_narration_tweaks

* map_tweaks_grammar_tweaks

* the_last_content

* fix

* whoops_how_did_I_miss_that

* mapping_tweaks_and_code_tweaks

* more_map_tweaks

* applied_eneocho_change

* add_dizzy_to_leader_knockdown

* changed_some_barricades_to_shutters

* some_map_fixes_n_tweaks

* adjusted_narrative_point

* some_final_tweaks

* fixed_some_access_changed_ufo_doors

* tweaked_ufo_exterior_doors

* added_piping_to_new_hobo_rooms

* slightly_reduced_research_level_grenades

* adds_one_more_vox_raider

* removes_turretprotected_from_vault_area_entries

* addresses_chemistrydm_review

* gym_rats_have_better_code

* more_fixes

* attempt_to_resolve_conflicts

* when_at_first_you_don't_succeed

* we_did_it_patrick

* vox_raider_loot_behavior_draft

* more_changes

* final_edits
2022-05-04 03:24:46 -05:00
Eneocho
5b9eee2505 fixes pizza rocket (#32483)
* delightfully devilish

* slices again for the funny hating people

* special margherita slice for the rocket
2022-04-30 21:11:24 -05:00
kane-f
d348f4db94 Species exclusive and discounted uplink item support (#32471)
* Species exclusive and discounted uplink item support

* These guys too

* Wow, they have it!

* Better check

* Finally tested working

Co-authored-by: kanef <kanef9x@protonmail.com>
2022-04-30 17:49:54 -05:00
Eneocho
0390e9685c Roboticist's Tears, the best soup you'll eat. (#32472)
* roboticist's tears recipe

* roboticist's tears

* roboticist's tears and mommi spaghetti icon fix

* oops

* oops 2: Electric boogaloo

* oops 3: now it's personal

* oops 4: family comes first

* this is what i get for typing instead of copypaste

* i swear to god if this one fails too i will scream

* absolutely heretical

* animated roboticist tears
2022-04-30 17:47:27 -05:00
jwhitak
c51eb8eaa4 stoxin2 changes (#32415) 2022-04-30 16:57:13 -05:00
kane-f
66c17906f7 Targeting-based reagent mob reaction, attempt 2 (#32424)
* Reviving this PR

* Reviving this PR

* Reviving this PR

* Cleaning up this part

* Easier way to do it, and all

* No drop?

* .head

* Cleaner systems

* Forgot more specific type

* Better than a define supposedly

* Grammar fix and logic slimdown

Co-authored-by: kanef <kanef9x@protonmail.com>
2022-04-30 16:40:26 -05:00
jwhitak
cb7d1c462f Adds a delay to holy water/potassium reactions (#32396)
* Holy Hand Grenade Plays Song before Boom

* Update Chemistry-Recipes.dm
2022-04-30 16:34:20 -05:00
gurfan
6b995f559d [Cult 4] Rituals System, Return of Sacrifices, Cursed Blood (#32323)
* rituals

* hmm

* sacrifices

* aaaa

* aa

* commit

* tear reality

* helpful commit message

* merge

* remove eclipse/endgame stuff from other branch

* update pylon type name, fix conflicts

* fix warnings?

* flavor text updates and objectives

* re-enable conversion flavortext, blood dagger mindUI, new "rune skin" tattoo, cursed blood ritual, fix jittery seer effect, beno with a blood dagger

* im not writing a commit message

* override

* scoreboard and remove debug hud element

* syntax

* oh

* stashed changes

* fix warning

* Update code/_onclick/mindUI/bloodcult/cultist.dm

Co-authored-by: DamianX <DamianX@users.noreply.github.com>

* Update code/datums/gamemode/factions/bloodcult/bloodcult.dm

Co-authored-by: DamianX <DamianX@users.noreply.github.com>

* cleanup

* remove unused procs

* .

Co-authored-by: DamianX <DamianX@users.noreply.github.com>

* Update code/datums/gamemode/factions/bloodcult/bloodcult_buildings.dm

Co-authored-by: DamianX <DamianX@users.noreply.github.com>

* Update code/datums/gamemode/factions/bloodcult/bloodcult_buildings.dm

Co-authored-by: DamianX <DamianX@users.noreply.github.com>

* Update code/datums/gamemode/factions/bloodcult/bloodcult_buildings.dm

Co-authored-by: DamianX <DamianX@users.noreply.github.com>

* Update code/datums/gamemode/factions/bloodcult/bloodcult_buildings.dm

Co-authored-by: DamianX <DamianX@users.noreply.github.com>

* Update code/datums/gamemode/factions/bloodcult/bloodcult_buildings.dm

Co-authored-by: DamianX <DamianX@users.noreply.github.com>

* Update code/game/gamemodes/scoreboard.dm

Co-authored-by: DamianX <DamianX@users.noreply.github.com>

* Update code/game/turfs/turf_flick_animations.dm

Co-authored-by: DamianX <DamianX@users.noreply.github.com>

Co-authored-by: DamianX <DamianX@users.noreply.github.com>
2022-04-17 16:03:03 +02:00
DamianX
2183251ac3 Fixed a bug that made the all-in-one grinder always consume all stacks (#32361) 2022-04-16 16:50:21 +02:00
kane-f
d34a7dab82 Admin-only custom proc call reagent: Procizine (#32337)
* Admin-only reagent: Procizine

* Admin-only reagent: Procizine

* Admin-only reagent: Procizine

* Admin-only reagent: Procizine

* Admin-only reagent: Procizine

* Advanced options

* Cleanup

* Cleanup

* Attributes and overdose

* Descriptions

* Tolerance and withdrawal

* Reverts unatomic cleanup

Co-authored-by: kanef <kanef9x@protonmail.com>
2022-04-16 16:46:23 +02:00
Eneocho
fdeae082c3 Aminoblatella, a cockroach-flavoured member of the Aminomicin family. (#32312)
* Aminoblatella

* Aminoblatella and its reactions

Also relocated synthparrot to be under aminomicin.

* Aminoblatella define

* tweaked values

* removing duplicate code as requested

tested

* Update Chemistry-Recipes.dm
2022-04-15 16:38:43 -05:00
Hinaichigo
d63936641e Breakable Objects v2 (#32255)
* Generalize breakability to obj. Standardize health and maxHealth for objs. Make flashlights, cameras, beakers, and wall-mounted lanterns breakable.

* Moved breakable.dm.

* Fix metaclub beepsky's maxhealth to maxHealth.

* Attempted to fix named argument error.

* Attempt to fix take_damage() derived proc named argument error.

* Attempt to fixed named argument error.

* Fragments can be obj not just item.

* Remove debug.

* .

* Fixed conflicting proc definitions.

* Attempt to fix runtime.

* Partly dissolve existing implementations of object health into general framework.

* Declare parent args in take_damage() proc overrides.

* Typo fix.

* Comment change.

* Change destroy to qdel.

* Update breakable.dm

Check for null teeth.

* Teeth check.

* .

* Gum check.

* Bugfixes and general object kicking.

* .

* fix kicking

* .

* .

* Kicking small items around.

* Throwing something at an object to break the latter.

* Fix storage inconsistencies.

* Nicer kick damage calculation.

* You don't need teeth to bite properly with a beak.

* Items can take damage landing in disposals.

* Undo that.. there's bug potential.
2022-04-13 08:57:21 -05:00
DeityLink
d3f9ddb555 FixPoutinePlate (#32376) 2022-04-12 16:09:16 -05:00
Eneocho
cc2821747f Fixing the vox nuggets and drumsticks II: Electric Boogaloo (#32362) 2022-04-08 09:39:44 +02:00
Eneocho
30bc089476 Insectoid monkeycubes for sale in cargo. (#32322)
* roachcube

* roachcube box

* roach cubes
2022-04-05 17:42:35 +02:00
DamianX
3e16faa0c7 Fixed plasma reagent runtime (#32216) 2022-03-20 11:50:46 +01:00
Eneocho
282bf8bcbb you think god stays in heaven because he's afraid (#32226) 2022-03-20 11:50:31 +01:00
Eneocho
408d807375 Makes janitor bleach useable. (#32228) 2022-03-20 11:50:14 +01:00
Cartlord
2aa68a50e6 Tenderloin now has Gravy (#32252) 2022-03-20 11:49:27 +01:00
d3athrow
642b843d9d Revert "[MDB IGNORE] Liquid reagent puddle system (#32169)"
This reverts commit a5b08f232a.
2022-03-17 14:13:40 -05:00
d3athrow
2572d4c8a5 Revert "Enables puddle reacting/spreading (#32211)"
This reverts commit 7ecbd70997.
2022-03-17 14:12:59 -05:00
d3athrow
1aaad15c48 Revert "Extinguisher/smoke puddle nerfs (#32215)"
This reverts commit 2666d512b8.
2022-03-17 14:12:42 -05:00
d3athrow
0c21847e10 Revert "Fixes puddles being made on walls and similar things (#32217)"
This reverts commit 52bd358228.
2022-03-17 14:12:28 -05:00
d3athrow
a1c0cf16ce Revert "Puddle slipping tweaks (#32231)"
This reverts commit f0ec7882fd.
2022-03-17 14:12:11 -05:00
kane-f
2666d512b8 Extinguisher/smoke puddle nerfs (#32215)
* Extinguisher/smoke puddle nerfs

* Slight buff but still overall nerf of smoke on turfs

Co-authored-by: kanef <kanef9x@protonmail.com>
2022-03-17 10:32:38 +01:00
kane-f
f0ec7882fd Puddle slipping tweaks (#32231)
* Puddle slipping time tweak

* Sanity

* Sanity

* Adds these

* No minimum puddle size, assisted visibility

Co-authored-by: kanef <kanef9x@protonmail.com>
2022-03-17 10:31:51 +01:00
ShiftyRail
6f20e1f4be Revert breakable objects for now. (#32234)
* revert

* why didn't this get reverted?
2022-03-15 22:42:00 +00:00
Hinaichigo
8ea93dd579 Breakable objects: cameras, wall-mounted lanterns, beakers, and flashlights (#32184)
* Generalize breakability to obj. Standardize health and maxHealth for objs. Make flashlights, cameras, beakers, and wall-mounted lanterns breakable.

* Moved breakable.dm.

* Fix metaclub beepsky's maxhealth to maxHealth.

* Attempted to fix named argument error.

* Attempt to fix take_damage() derived proc named argument error.

* Attempt to fixed named argument error.

* Fragments can be obj not just item.

* Remove debug.

* .

* Fixed conflicting proc definitions.

* Attempt to fix runtime.

* Partly dissolve existing implementations of object health into general framework.

* Declare parent args in take_damage() proc overrides.

* Typo fix.

* Comment change.

* Change destroy to qdel.

* Update breakable.dm

Check for null teeth.

* Teeth check.

* .

* Gum check.
2022-03-15 15:15:58 +01:00
kane-f
52bd358228 Fixes puddles being made on walls and similar things (#32217)
* Fixes puddles being made on walls

* Makes all dirs for now

* Actually should be none

Co-authored-by: kanef <kanef9x@protonmail.com>
2022-03-15 14:12:10 +01:00
kane-f
7ecbd70997 Enables puddle reacting/spreading (#32211)
* Enables puddle reacting, fixes log runtime

* Fixes spreding too

Co-authored-by: kanef <kanef9x@protonmail.com>
2022-03-13 18:29:55 +01:00
kane-f
a5b08f232a [MDB IGNORE] Liquid reagent puddle system (#32169)
* Actual icon

* Puddle reformatting

* Basis of smoothcode

* Moving puddle code into a turf reagent system, reformat and overhaul

* Make this act on splashing, for now

* More work on standardising behaviour

* More standardisation, should ideally make spread work nicer

* Some tweaks

* Fixes

* Makes it work in practice, code slimmed down

* More standardising

* Redone calculations

* Fixes infinite reagents

* Puddle scaling with volume

* Presets for mapping

* Actual stuff

* Better way

* Get actual turf

* Blacklisting some of these

* Evaporation rate

* Removing old splash verb, adding reagents to a turf should do this by default now

* Makes these invisible

* Makes this not cleanable, for now

* Standardising this into reagent stuff

* Fixes

* Space clears reagents

* Basic viscosity system

* Adds some rudimentary values

* Space cleaner thng

* Beginning rework of this, removing unused fuel type

* Fuel puddle rework

* Fuel puddle rework

* Find and replace mishap

* Removing from .dme

* Removing unused variable

* Rewriting the preset init ones

* Redoing mapped puddles

* Makes sure these are gone

* Type fix

* New plane and layer

* Makes slip work

* Fix

* Fix

* Puddles can now react to crossing over it

* Proper bracketing

* Puddle values

* Current puddle reference to save on locating

* Nicer smoothing

* Tweaking values

* Water color tweak

* Greatly simplifies wet floor puddles

* Simplified line

* No reason for invisible puddles anymore

* Makes wet/dry vaccuum work with this

* Mop

* Reformatting how reagents are held

* Allows space cleaner to clean some kinds of puddles

* Fixing

* Moving this to simulated level

* Fixes puddles not being made anymore

* Standardised alpha

* Removing this for now

* Fixing chem dupe issue for when this matters

* Server config for behaviour

Co-authored-by: kanef <kanef9x@protonmail.com>
2022-03-11 19:13:44 -06:00
Eneocho
9153ab06b6 Silicate Citrus, a botanical source of Silicate. (#32179)
* Silicate Citrus, a botanical source of Silicate

* Turns out someone actually made a toast untoaster.

* Kinda looks like glass.
2022-03-11 05:46:08 +01:00
kane-f
fd92873d4b Allows merch computer food to be poisoned by does not tip backdoor (#32130)
* Allows merch computer food to be poisoned by does not tip backdoor

* Fix

* Ayy

* Even more standardised

* Keeps name varied

Co-authored-by: kanef <kanef9x@protonmail.com>
2022-02-24 14:27:29 -06:00
boy2mantwicethefam
a224eb3f38 Advanced Clown Shoes can now be emagged to become more spammy (#31929)
* shoes

* fix

* 1337
2022-02-24 01:21:03 -06:00