Commit Graph

1416 Commits

Author SHA1 Message Date
SECBATON GRIFFON
51aeb85ad4 Wizard's Arcane Tamper (#33409)
* beginning work on it

* the spell

* invocations and capitalization fix

* defibs n vendors

* case...

* machine frames

* compooters too

* T

* removes on death of mob

* removes on death of mob

* removes on death of mob

* Canisters and hacking

* Canisters and hacking

* inverted key behavior

* potted plants

* potted plants

* couches

* improves glass, visuals and method of saying things

* actual sprites and spellbook downside

* making it work

* food tampering

* new spell method

* kicking

* kicking

* the hungry bag

* the hungry bag

* the hungry bag

* the hungry bag

* the hungry bag

* movables

* more fun with welding tanks

* comms consoles

* request ones too

* markov paper

* better like this

* better like this

* randomised artifact

* starts on by default

* rand not random

* slot machines too

* removing this because if recursive casting is on it's just unfair

* spell cost adjust, microwaves, hydroponics

* door now properly stuck

* envelopes

* attempt at fixing vehicle stuff

* attempt at fixing vehicle stuff

* mirrors

* cash

* ID access random spam sanity

* Better system

* Better system

* doors like this

* doors like this

* better pen stuff

* more stuff

* more stuff

* spoons and forks

* conveyors

* cables

* grenades

* grenades

* grenades now work

* sharts

* singulo

* fix

* mops and janicarts

* mops and janicarts

* dna

* switchtool

* lotto vend

* inherit you git

* i said INHERIT

* arcade

* removing this

* only once please

* ways to do this

* better

* more table fun

Co-authored-by: SECBATON GRIFFON <sage>
2022-10-21 12:38:57 -05:00
nervere
3f698b6bb3 i before e except after c (#33268)
* i before e except after c

* i before e except after c

* i before e except after c
2022-09-12 20:56:08 -05:00
Optimism333
0726e2fef9 Drowsy B Gone: auto380 and fortyfive || And glock pain train (#33247)
* drowsy_b_gone

* agony_increase

* woah_there

* a_little_less
2022-09-12 20:53:12 -05:00
adacovsk
49b8a5626f necro fix (#33215) 2022-09-10 10:10:46 -05:00
Optimism333
6d77823457 Space Polyp Milking Fix and Gelatin Condiment Sprites (#33208)
* polyp_milking_fix

* adds_gelatin_condi_sprites

* forgot_to_save_sprite

* slight_desc_change

* this_wont_compile

* progress_sort_of_kinda

* null_b_gone

* fixed_glassdm_line

* fixed_per_kurf
2022-09-06 23:59:47 -05:00
gurfan
96e022bd1a super duper shotgun (#33157)
* super duper

* ogg

* icon

* fix

* sound fix

* Update shotgun.dm

* Update shotgun.dm

* a
2022-09-01 21:29:04 -05:00
adacovsk
bcf586a0ff Mothership grey clothing now melts from water (canon) (#33093)
* acidible to dissolvable

* compiles and works

* move message to acid_melt proc

* add probability

* fix some alien shitcode

* Update mothership_lab.dm

* Update supplypacks.dm
2022-08-22 18:39:16 -05:00
gurfan
b64a83e0c3 buffs (#33060) 2022-08-17 23:00:05 -05:00
adacovsk
b2e1d410ab Staff of Change bugfixes (#33028)
* cursed

* Update mind.dm
2022-08-17 22:50:23 -05:00
adacovsk
a639824a61 Increase Max Explosion Radius (#32957)
* increase some numbers

* Update dice.dm

* Update game_options.txt

* softcap

* Update transfer_valve.dm

* lower cap

* eyup

* moderate amount
2022-08-17 22:20:43 -05:00
kane-f
e8654ba6bd Ingesting reagent mob reaction rework (#32889)
* Beginning work on this

* Fixing these

* Restoring this because it's still a problem

Co-authored-by: kanef <kanef9x@protonmail.com>
2022-07-12 14:13:42 -05:00
adacovsk
a05d78af20 Hydroponics Mutations Rework (#32853)
* commits were messed up, should be good now

* fix hematophage and balance left4zed

* Update hydroponics_reagents.dm

* Update Chemistry-Reagents.dm

* Update Chemistry-Reagents.dm

* Update hydroponics_mutations.dm

* Eneocho changes

* Update hydroponics_mutations.dm

* Update hydroponics_mutations.dm

* Update hydroponics_mutations.dm

* Update hydroponics_mutations.dm

* no more no_react and auto_harvest

* Update hydroponics.dm

* somatoray changes

- all genes included
- replaced particle effects
- put it all in energy weapon special.dm

* somatoray compiles

* somatoray generally works

* Update special.dm
2022-07-10 11:37:28 -05:00
adacovsk
7aa50389e0 Staff of Necromancy tweaks (#32870)
* zombie

* condense

* compiles

* Update special.dm

* Update special.dm

* done

* Update special.dm

* done done

* Update __compile_options.dm
2022-07-04 15:10:29 -05:00
adacovsk
91d18efde8 Necromorph and zombies are now friends (#32798)
* necromorph

* other files

* fix for quick reviving

* bugfix

* Update necro.dm

* Update necro.dm
2022-06-21 22:05:15 -05:00
Hinaichigo
b8c8106f26 Fixes duplicate args (#32801)
* Update shuttle_engines.dm

* Update special.dm

* Update weaponry.dm

* Update swords.dm
2022-06-16 07:04:18 +02:00
adacovsk
a2629eedb7 Update siegecannon.dm (#32697) 2022-05-27 23:55:57 -05:00
D3athrow
36c4428c24 possibly fix infinite bananball works 2022-05-27 22:24:28 -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
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
Optimism333
e7755c9e6f fixes_saucer_drone_runtime (#32635) 2022-05-20 02:08:53 -05:00
tinysaturn
0cf3005e99 testcommit (#32489) 2022-05-07 22:40:32 -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
Optimism333
095151246b Fixes Scrambler and Microwave Ray Effects Ignoring Shield Blocks (#32473)
* fixes_ray_effects_ignoring_shield_blocks

* fixed_hopefully
2022-04-30 17:43:40 -05:00
ValkyrieSkies
2d56344da3 Renames C20r ammo (#32440) 2022-04-30 16:45:53 -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
d3athrow
6a0f331994 maybe prevent clown cannonballs from going bananas (#32418) 2022-04-21 03:58:41 -05: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
280247adea fixes liberator missing icon (#32315) 2022-03-29 19:00:34 +02:00
Eneocho
d35d5a8bdf liberator gun buff (#32236)
* liberator gun buff

* blube

* alright
2022-03-19 15:49:35 +01:00
d3athrow
642b843d9d Revert "[MDB IGNORE] Liquid reagent puddle system (#32169)"
This reverts commit a5b08f232a.
2022-03-17 14:13:40 -05:00
DamianX
30b5a2ac1d Fixed a bunch of hard dels (#32186) 2022-03-11 19:14:04 -06: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
adacovsk
c5917aca71 Fix flare (#32040)
* Update flare.dm

* Update flare.dm

* Update flare.dm
2022-02-24 23:51:21 +01:00
adacovsk
b30153715d Scoreboard organization/optimization (#32094)
* Scoreboard

* Update next_map.dm

* Update gameticker.dm

* Update role.dm

* ugh

* safe me

* added dat to every proc

* Update scoreboard.dm

* Update scoreboard.dm

* Update department_score.dm

* turfssingulod

* Update misc_score.dm

* Update scoreboard.dm

* Update scoreboard.dm

* Update mobs.dm

* Update items.dm

* Update stunbaton.dm

* Update human_attackhand.dm

* Update living_defense.dm

* Update misc_score.dm

* Update swords_axes_etc.dm

* Update human_attackhand.dm

* Update misc_score.dm

* Update misc_score.dm

* Update scoreboard.dm
2022-02-22 17:39:14 +01:00
kane-f
3bd3f877b3 Slight procgun fix (#32031)
Co-authored-by: kanef <kanef9x@protonmail.com>
2022-02-10 06:53:42 +01:00
west3436
010210e724 Sock Weapons (#31835)
* Sock weapons

* Removes debugging in-hand sprites.

* Increases brick sock size to medium and enables deconstruction.

* oops lol

* Unique sprites, in-hand sprites, and better sounds.

* Update code/modules/projectiles/guns/projectile/constructable/sockweapons.dm

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

* Update code/modules/projectiles/guns/projectile/constructable/sockweapons.dm

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

* Update code/modules/projectiles/guns/projectile/constructable/sockweapons.dm

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

* Update code/modules/projectiles/guns/projectile/constructable/sockweapons.dm

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

* Update code/modules/projectiles/guns/projectile/constructable/sockweapons.dm

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

* Update code/modules/projectiles/guns/projectile/constructable/sockweapons.dm

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

* Update code/modules/projectiles/guns/projectile/constructable/sockweapons.dm

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

* Update code/modules/projectiles/guns/projectile/constructable/sockweapons.dm

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

* Prevents glued soap from being used in construction

* Retains the soap being used and transfers fingerprints.

* reee

* Revert "reee"

This reverts commit e3e02bd173.

* forgot to include this lol

* Retains sock + fixes exploit.

* Optimization & removal of grab intent requirement for decon.

* Brick socks no longer cost 2 bricks.

* Displays assembly message following construction.

Co-authored-by: DamianX <DamianX@users.noreply.github.com>
2022-02-09 04:12:52 +01:00
kane-f
bef804642f Attack log admin message tweaks (#31949)
Co-authored-by: kanef <kanef9x@protonmail.com>
2022-01-29 14:56:44 -06:00
adacovsk
0ac93cb17c Fixed Alien HUD (can see in the dark) (#31918)
* Fixed Alien HUD (can see in the dark)

* Update energy.dm

* neurotox does more
2022-01-29 05:06:52 +01:00
SonixApache
1e2d0f1de6 adds 'detain' as option for lawgiver stun (#31841) 2022-01-19 07:17:16 -06:00
kane-f
5d9af4cc30 Adminspawn-only proc call gun (#31732)
* Adminspawn-only proc call gun

* Can't forget this

* Let there be gunk

* Here too

* Here too

* This is nicer

* Less messy in some cases

* Should be this permission to be consistent

Co-authored-by: kanef <kanef9x@protonmail.com>
2022-01-10 19:01:55 -06:00
kane-f
d0949323b8 More time agent fixes (#31790)
* Fix one

* Fix for pinpointer targeting

* Fixing anomaly stuff

* Fixing area in this

* Fix for compiler warning

* Better pinpointer

* Better pinpointer

* Better pinpointer

* Oh it was this

* Proper name

* Fixes typo

* Sanity

* Don't want this

* Disambiguating name for locate objective's sake

Co-authored-by: kanef <kanef9x@protonmail.com>
2022-01-10 19:01:25 -06:00
Kurfursten
1c5e9e8c93 The Liberation is at Hand (#31666)
* The Liberation is at Hand

* Liberators now charge much faster

* icons
2021-12-26 00:03:20 -06:00
jellyveggie2
37b6fcd9a4 Palette crayon fix (#31692)
* Fix crayons bricking palettes

* Fix colors from pens (and now crayons) refusing to mix with other colors on palette
2021-12-25 11:31:31 -06:00
Kurfursten
65c64a194f Dragonshell Buff (#31665) 2021-12-25 11:31:06 -06:00
Optimism333
c74f8ed23d Ayy Laser Guns and UFO Vault Update (#31592)
* Ayy_Laser_Guns_and_Hostile_Mob_Update

* Fixed_In-hand_Inconsistency

* Even_Rounder_Ufo

* Grey_Leader_Soldier_and_Explorer_Suits_Hold_Disintegrators

* Made_Immolation_Ray_Slightly_Stronger_40->45

* Heavy_Disintegrator_Can't_Be_Dual_Wielded

* Armor_Doesn't_Do_Anything_For_Mobs_Anyways

* Hostile_Grayys_Attack_Unconscious_Players

* DOH

* Gives_Space_Greys_A_Faction

* Simpler_Faction_Name

* A_Little_Less_Conversation

* Adds_Blast_Shields_to_Ufo_Bridge

* Some_Finalizing_Edits

* Some_Cleanup_and_Desc_Tweaks

* Removed_Redundancies

* Grey_Hostiles_Speak_Quack
2021-12-20 20:36:23 -06:00
SonixApache
572b4b9e98 magazine color marking with crayons (#31656)
* magazine color marking with crayons

* check for icon

* you did that, idiot
2021-12-20 11:23:57 -06:00
jellyveggie2
00c0026ce4 Make plastic sortable for recycling, and make a multitude of items recyclable (#31593)
* Most plastic items are now recyclable, under the label "miscellaneous". Amounts to be balanced, currently same as recipe.

* Mineral tiles can be recycled

* Gold teeth and collection plates can be recycled

* Recycling sorter will now empty out crates and closets before sorting, if possible

* New recycling material category for the sorter, plastic. Many items updated to be considered such.

* derp recycling sorter fixes

* derp what was the point in creating a category otherwise

* just in case

* dorf recycling

* Smithing recycling? It's been a while and I don't remember what I was up to.

* Fix #28612 (You cannot recycle coins into their base metal)

* Blacksmithing recycling nearly done now,
Just some weirdness with tower shields left, plasteel component doesn't transfer materials correctly.

* All sheets with materials defined should actually have a .materials now, so I can grab an alloy sheet and use it's materials to decide what's being transferred instead of trying to guess of it's material type/hoping it has a material type at all. Fixes tower shields not having plasma from plasteel.
There's still a TODO in how materials are transferred to blacksmithing products, and a bug that predates my changes, but I've no idea how to go about either and this whole PR feels unatomic enough as it already is. I just wanted to be able to recycle plastic bags man, not overhaul crafting.

* Sorter will now consider crates it can't open as non-recyclable, since the recycler simply can't deal with those and it wouldn't make sense to create another way to unlock locked crates anyway. No more clogged recycling because of a closed crate.

* Update boomerang materials

Co-authored-by: Jellyveggie <39123109+Jellyveggie@users.noreply.github.com>
2021-12-20 10:59:06 -06:00
kane-f
1ffec4dc64 Standardises opposite directional returns. (#31603)
* Standardises opposite_dirs and reverse_direction

* Moves this here, makes more sense in this file

* Compile

* Compile test for this

* Fix

* Cuts out now useless proc

* Cuts this down too

* Additional helper

* Better as a define

* Using this macro in practice

Co-authored-by: kanef <kanef9x@protonmail.com>
2021-12-13 19:22:55 -06:00
Exxion
ad228795b0 Approximately the same (#31468) 2021-11-29 13:18:06 +01:00