Commit Graph

34897 Commits

Author SHA1 Message Date
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
8b6d3f59a6 Update breakable.dm (#32229)
fix runtime
2022-03-15 15:29:08 -04:00
Hinaichigo
657a1f1c0d Fixes inability to put items into containers with unset health. (#32225)
* hotfix

Fixes bug.

* Update storage.dm
2022-03-15 10:36:13 -05: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
305c01e862 Puddle cleaning QoL (#32210)
* Puddle cleaning QoL

* To prevent water spam

* Emptying bucket

* Emptying bucket

* Explosions spill contents before delete of bucket

* Explosions spill contents before delete of bucket

* Removes mouse opacity

Co-authored-by: kanef <kanef9x@protonmail.com>
2022-03-13 20:37:57 +00: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
b5bafa3b09 Fixes puddles being pulled or put in crates (#32208)
Co-authored-by: kanef <kanef9x@protonmail.com>
2022-03-12 20:36:55 -05:00
DamianX
7ff7dc34ff Fixed a PDA runtime (#32192) 2022-03-11 19:14:33 -06:00
kane-f
342cac35eb Pulse demon speaking fixes and tweaks (#32191)
* Pulse demon speaking fixes and tweaks

* Removing generated reaper files (good hint on where I got the base sounds though)

* Logic fix

* Makes a bit quieter

Co-authored-by: kanef <kanef9x@protonmail.com>
2022-03-11 19:14:29 -06:00
ExpulsionSnooper
34af9f7a51 Makes_Time_Anomaly_Timeless (#32189) 2022-03-11 19:14:17 -06:00
DamianX
30b5a2ac1d Fixed a bunch of hard dels (#32186) 2022-03-11 19:14:04 -06:00
kane-f
37549a0084 Explosion log fixes (#32174)
* Explosion log fixes

* Reformat

* Reformat

Co-authored-by: kanef <kanef9x@protonmail.com>
2022-03-11 19:13:56 -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
cfacc40135 Voting Methods (#31907)
* Voting System

The current voting system is very confusing and difficult to use or modify, so I updated it.

I also have added another voting method, described in #31803. Do not be alarmed, weighted voting is still used, but other methods will be available.

* Everything appears to work

Weighted and majority definitely work

* Update voting.dm

* admin can change from votable or nonvotable

* Revert "admin can change from votable or nonvotable"

This reverts commit 6d0c547958.

* done

* Update voting.js

* done done

* a

* Update voting.dm

* can change voting method

* Update voting.dm

* Update persistence_misc.dm

* a

* Voting Methods

I'll try again now that I separated the changes. Hear me out: I'm just adding new methods, they are not used unless an admin uses them, or a PR is made to change the default. The default remains the same as before. Adding two voting methods: persistent (works only for maps) and random (meme). Considering adding another methods too upon request.

* not working

* done

* Update voting.dm

* Update voting.dm

* Update voting.dm

* Update voting.dm

* Update voting.dm

* Update voting.dm

* Update voting.dm

* Update voting.dm

* eyup

* Update voting.dm

* Update voting.dm

* Update persistence_misc.dm

* Update voting.dm

* Update voting.dm

* Update persistence_misc.dm

* done

* done

* Update voting.dm

* Update voting.dm

* Update voting.dm

* Update voting.dm
2022-03-11 18:43:33 +01:00
DamianX
ee96498ce9 Let players insert/remove IDs/pens from PDAs even if they're not in an inventory slot (#32163)
* Let players insert/remove IDs/pens from PDAs even if they're not in an inventory slot

* [ci skip] rm outdated comment
2022-03-11 05:48:16 +01:00
DamianX
c40f4b384f Flatpack fabricators stack flatpacks (#32173)
* Flatpack fabricators stack flatpacks

* Restored error messages
2022-03-11 05:47:29 +01: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
0cd4d31b7d Some pulse demon fixes (#32187)
Co-authored-by: kanef <kanef9x@protonmail.com>
2022-03-11 05:44:15 +01:00
DamianX
f2ba0201b6 Draw closed firelocks above plastic flaps and curtains (#32172) 2022-03-09 04:19:44 +01:00
DamianX
5f56495f54 Fixed salvage-crate-sender runtime error (#32165) 2022-03-09 04:19:03 +01:00
west3436
74168bec9e Lotto ticket adjustments (#32157)
* Lotto ticket adjustments

* Typo

* More fixes
2022-03-09 04:18:43 +01:00
kane-f
ae2715d44b Fixes bunsen burner not updating beaker icon (#32180)
Co-authored-by: kanef <kanef9x@protonmail.com>
2022-03-09 04:10:54 +01:00
kane-f
3ed30452cf Fixing reboot runtime if no map vote is called with it enabled (#32181)
Co-authored-by: kanef <kanef9x@protonmail.com>
2022-03-09 04:09:57 +01:00
Eneocho
98d223bbe0 Makes cytisine farming viable (#32162) 2022-03-07 13:46:11 +01:00
kane-f
92d2a71f62 Mapping admin tools overhaul (#32149)
* Starting this with plumbing

* Next, these

* Lint fix

Co-authored-by: kanef <kanef9x@protonmail.com>
2022-03-07 13:41:20 +01:00
Hinaichigo
b1be3a753d Basic framework for generic breakable items. (#32007)
* Basic framework for generic breakable items.

* Fixed comment.

* Fixed up a few things and generalized breakability to obj/item.

* .

* .

* .

* Fixed up the attack message generation for breakable items. Made items transfer their fingerprints, fibers, and bloodstains to their fragments when broken. Added capability to specify a list ofitems that bypass breaking an otherwise breakable item.

* Breaking via kicking with propulsion of fragments. Breaking upon ballistic impacts. Removed open-handed harm-intent breaking by humans.

* Adding breakability to kick_act().

* Specifying glanced attack text.

* Added general broken check to obj/item/throw_at() so that any time an item takes breaks apart from a blow that also propelled it, the fragments get propelled instead.

* Can specify multiples of a given fragment type via fragment_amounts.

* Items can be shot and broken by projectiles.

* Renamed defines.

* Projectiles will break impacted items and send them flying.

* Fixed projectile impact momentum transfer.

* The contents of containers will be dropped when the item is destroyed. Also fixed diagonal fragment propulsion by projectiles.

* Spilling reagents when an item breaks.

* Placeholder proc for any damage-related icon updates.

* Fixed conflict between container-smashing and container-insertion on harm intent.

* Breaking items by biting them.

* Sounds for when an item is hit.

* Breaking items when they are used to attack a mob.

* Unset default breakability values.

* Added extra check for breakability in break_item.

* Update breakable.dm

* Update breakable.dm

* Update breakable.dm

* Update breakable.dm

* Set health_item to health_item_max by default.

* Removed redundant reagent spilling.

* Melee target will be splashed with contained reagents when an item breaks on them.

* .

* .

* Update breakable.dm

Throw impact damage to an item takes into account the weight of its contents as well.

* Fixed up syntax in a few places.

* .

* Changed BREAKABLE_NOMOB to BREAKABLE_MOB

* Changed health_item to health, and health_item_max to maxHealth.

* Create breakable_defines.dm

removed extra newline

* Update breakable.dm

spelling fix

* Made take_damage() call try_break() by default, and other changes.

* Update storage.dm

Removed unneeded variable.
2022-03-07 13:38:17 +01:00
kane-f
0a4d56da5a Multi-Z cables (#32113)
* Multi-Z cables

* Implements it in snowbox

* Fixing dme

* Powernets fully work now

* Makes open space coil handling nicer, now checks to stop if tile below can't handle cable coil placement

* Allowing pulse demons to use multi-Z cables for traversal

Co-authored-by: kanef <kanef9x@protonmail.com>
2022-03-05 10:09:38 -06:00
adacovsk
e4fef771e0 Scoreboard tweak (#32154)
* Clean up scoreboard

* Update scoreboard.dm

* Update dynamic.dm

* Update dynamic.dm

* Update dynamic.dm

* Update dynamic.dm

* Update dynamic.dm

* Update scoreboard.dm
2022-03-03 04:25:49 +01:00
DamianX
8dcc7ca7f8 Restored dusky's robotic vocal cords (#32160) 2022-03-02 22:22:31 -05:00
kane-f
cf297f8529 Fixes initialised dir issues with HE pipes (#32159)
* Fixes initialised dir issues with HE pipes

* Missing supercall

Co-authored-by: kanef <kanef9x@protonmail.com>
2022-03-02 20:00:31 +01:00
Exxion
636adb8fdc Fixes really major bug that really should have been fixed a long time ago (#32151) 2022-03-01 00:54:56 +01:00
adacovsk
56f0ff8943 Speedup roundend after shuttle arrives at Centcomm or nuke goes off (#32138)
* Update nuclearbomb.dm

* Update gameticker.dm

* Update gameticker.dm

* Update nuclearbomb.dm

* Update world.dm
2022-02-28 19:33:42 +01:00
west3436
58fc717e8a Prioritizes in-hand suicide methods over location-based ones (#32147) 2022-02-28 19:30:12 +01:00
adacovsk
c95a281edd teak scoreboard (#32145) 2022-02-28 19:29:25 +01:00
Eneocho
5e028120d1 typo and rewording on frame cartridge (#32148) 2022-02-28 19:28:54 +01:00
kane-f
3d517dd105 Traitor item: F.R.A.M.E. PDA cartridge (#32125)
* Traitor item: F.R.A.M.E. PDA cartridge

* Fixing name for consistency

* Fixes

* Adds to memory

* Reformatting virus acceptance

Co-authored-by: kanef <kanef9x@protonmail.com>
2022-02-26 16:19:30 +01:00
adacovsk
a88a93163c Update voting.dm (#32135) 2022-02-24 19:14:28 -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
257f1bda56 Voting hotfix (#32134)
* Update voting.dm

* Update voting.dm
2022-02-24 21:59:55 +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
adacovsk
4a9929a6a8 Scoreboard Tweak (#32127)
* Scoreboard Update

Fixed small thing with antag implants
Redid the silicon scoreboard to minimize looping

* Update scoreboard.dm

* Update scoreboard.dm

* Update scoreboard.dm

* Scoreboard

* Update scoreboard.dm

* Update vampire_faction.dm
2022-02-24 14:25:22 -06:00
kane-f
1795fa8644 [MDB IGNORE] Allows map elements to be loaded from TGM format files (#32050)
* Part 1: Grid vars

* Preview code for part 2

* More progress, now somewhat works, not enough to uncomment

* Part 2: The grid itself

* Fixes key issue and parsing issue in one fell swoop somehow. Maps can now be loaded from TGM, but with keys the wrong way around

* Final part, loading system now fully works, on to converting vaults to tgm next

* Converts some more vaults

* Revert bad hotfix

* Much saner solution

* Solution now works

* Removing leftover testing logs, taking dungeons off tgm since they break with them a bit

* More vaults converted

* Rest of normal vaults

* Mining vaults

* Snaxi vaults

* Away missions work too, so these get to be converted

* Optimised code

* Makes map dimensions fetching work properly on TGM now

* Trimming down map dimension function, still works

* Optimising loading code too

Co-authored-by: kanef <kanef9x@protonmail.com>
2022-02-24 14:24:43 -06:00
west3436
84be6089ee Lotto Ticket Updates (#32120)
* Initial commit

* Fixes runtime

* Adds lotto vendors to each map's bar.

* Revert "Adds lotto vendors to each map's bar."

This reverts commit 729b84d957.

* Fixes proc

* Additional fixes

* One more description adjustment
2022-02-24 11:26:02 -06:00
adacovsk
3c4288979f Voting.dm associated files tweaks (#32064)
* Trying

* works

* Update voting.js

* Update voting.js

* Update voting.js

* moved text
2022-02-24 11:22:37 -06:00
Eneocho
8bba5b371b removes NOCLONE from ghoulification (#32058) 2022-02-24 11:22:04 -06:00
Eneocho
7c43d8460b fix (#32053) 2022-02-24 11:20:49 -06:00