Commit Graph

780 Commits

Author SHA1 Message Date
DeityLink
15121b534f Nuka Cola tweaks (#35531)
* nuka cola tweaks

* same credits as iron
2023-12-09 03:27:44 -06:00
Eneocho
b5d307fd06 fixes one big fucking oversight (#35335) 2023-11-11 15:18:57 -06:00
Optimism333
cfc3ce6fb0 Small Vault Update (Pod Station, Broke UFO) (#34912)
* small_vault_update

* maybe_fix_pipes_p2

* fixed_pipes

* remove_useless_button

* final_podstation_touches

* fixed_problem_add_password

* few_more_tweaks

* expanded_freezer_bit_more

* adds_missing_area
2023-08-29 15:33:52 -05:00
Securitymain
ae2b899ae0 Fix abandoned crate ez opening on alt click (#34568)
* Update abandonedcrates.dm

* Fix clicking crate while wearing salvage captain ID opening the hacking menu

* Update icon on unlock
2023-07-07 18:40:30 +01:00
SECBATON GRIFFON
f99e7c6ee1 Stack examine fixes (#34270)
Co-authored-by: SECBATON GRIFFON <sage>
2023-05-25 11:52:47 -05:00
gurfan
fd9db86780 Revert "Explosions update: More items throwable, general refactoring (#34153)" (#34235)
This reverts commit 17e24861d7.
2023-04-25 17:35:11 -05:00
SECBATON GRIFFON
17e24861d7 Explosions update: More items throwable, general refactoring (#34153)
* Explosions update: More items throwable, general refactoring

* Explosions update: More items throwable, general refactoring

* more stuff affected

* comments

* re enabling. whoops

* multi-z block effects

* closer to old behaviour now

* so this behaves right

* stops this being an infinite loop

* distance scaling now works right

* makes this less specific

* makes this less specific

* cleans this line up

* more stuff, and code cleanup along the way

* this line is egregious too

* fixes here

* cables

* replacing all instances of 2** with 1<< as they're the same (minus the ability to use fractional exponents but nothing changed uses it here anyways)

* optimised down throw_at function. TODO: TEST THIS

* optimised down throw_at function. TODO: TEST THIS

* optimised down throw_at function. TODO: TEST THIS

* changing these back because... it's faster? what...

* works fine, this is just to be on the safe side

* cleanup

* cleanup

* clearer var names

* postpone air cycle option in comments

* we can add it i guess

* this is redundant

* oh this is needed

* this is redundant

---------

Co-authored-by: SECBATON GRIFFON <sage>
2023-04-24 22:01:34 -05:00
SECBATON GRIFFON
67a6fd0a06 Items exploding while thrown admin option (or on arcane tampered floors) (#33830)
* Items exploding on arcane tampered floors (or as an admin option)

* Items exploding on arcane tampered floors (or as an admin option)

* throw_impact as suggested

* removing redundant check, adding sanities due to qdel possibility

* less indents

* less wizard cheese

* changed method, works muuuch better now

* inverted this on request

* fixing this

---------

Co-authored-by: SECBATON GRIFFON <sage>
2023-03-11 23:31:33 -06:00
SECBATON GRIFFON
d8c8a9bb90 Adds qdel defines (#33991)
* Adds qdel defines

* Adds qdel defines

* halfway through fixes

* rest of em

* fixes

* adds more

* list in action

---------

Co-authored-by: SECBATON GRIFFON <sage>
2023-02-10 15:01:18 -06:00
TJ
ccfc9de9db Make some coins lucky. (#33886)
* Make some minted coins lucky.

* Added shiny overlay for potentially lucky coins.
2023-02-10 14:51:43 -06:00
Eneocho
986eeee568 Fixes sprite issues with maria's hive mined tiles (#33893) 2022-12-26 15:23:21 -06:00
Eneocho
8e517066fd New mining vault: The Hivelord Queen's Lair (#33748)
* corrupted tiles and rocks

* hive walls

* hive overlay

* hive proper

* Maria no longer spawns on angie's lair

* .

* fixn

* fixes broken overlays

* more stuff

* updating vault proper

* will never see use but it makes me smile

* balance

* Update butchering.dm

* .

* what kurf said
2022-12-20 19:00:27 -06:00
SECBATON GRIFFON
4ba1550da4 Creates new type of asteroid boss (#33674)
* Creates new type of asteroid boss

* name suggested

* frost oil perfectly revives hivelord hearts

* frost oil perfectly revives hivelord hearts

* frost oil perfectly revives hivelord hearts

* frost oil perfectly revives hivelord hearts

* frost oil perfectly revives hivelord hearts

* wrong way round

* makes the boss less actually impossible

Co-authored-by: SECBATON GRIFFON <sage>
2022-11-23 14:40:47 -06:00
adacovsk
38839e9151 Collecting some Profiler valids (#33193)
* Closet refactor #20265

* Update mob.dm
2022-09-01 21:41:18 -05:00
boy2mantwicethefam
f7b929993f Some Science-related changes (#33155)
* Changes

* commits
2022-09-01 21:28:40 -05:00
Eneocho
f45a4b86f7 fixes spade needing wood to build (#32999) 2022-08-17 22:35:41 -05:00
kane-f
03ae6fd44e Adds console screens (plus new upgrade types) to protolathes (#32800)
* Adds console screens (plus new upgrade types) to protolathes

* This should hopefully no longer be a problem

* Fourth tier

* Way it can be obtained

* Excludes it here

Co-authored-by: kanef <kanef9x@protonmail.com>
2022-07-03 10:13:59 -05:00
jellyveggie2
0471421e9a Reworks electric power grid to have priority levels (#32613)
* Move machinery procs from power to machinery. Getting real tired of confusing them for power procs, why were they even there?

* use_power = [0-2] replaced with the proper MACHINE_POWER_USE(NONE|IDLE|ACTIVE) defines. KEEP IT CLEAN

* Creates MACHINE_POWER_USE_GRID, for machines marked as MACHINE_POWER_USE_NONE that were actually drawing power, and doing so straight from the grid

* More numbers to defines

* Power connection component: Get rid of unused parameters on New() that were being misused anyway, and more importantly make the radio broadcaster actually draw it's power through the component instead of APCs.
NEEEEXIIIIS!

* ...actually adds MACHINE_POWER_USE_GRID this time
JEEEELLLYYYYYY!

* Converts a bunch of snowflakes into using the power connection component

* RECAP: Alright, I've fixed some major peeves and made sure no one's adding load to the powernet without going through a machine/component first, now is the time to start modifying how power draw works

* Give grid loads priorities, and convert powernet.load to a list of loads. Does nothing yet

* Satisfaction

* Converts power sink and singularity beacon

* Converts wall shield generator

* Converts emitters. Emitters will turn off below 30% satisfaction, and beam power will be affected by power satisfaction; eg: at 50% satisfaction beams will only be 50% as powerful

* Converts the antique matter synth

* Converts APCs

* get_satisfaction() for cables

* Converts SMES

* Converts artifacts

* Fixes a bunch of stupid things with SMESs and APCs, turns some more use_power numbers into defines, and gets rid of MACHINE_POWER_USE_GRID cause there's really no need for it, not yet.

* Fixes for power sink and singularity beacon

* Antique synth fixes

* More SMES fixes. No more free energy shenanigans, and measured output/load should update properly now

* Converts radio broadcaster and syphoners. Also adds a way to connect to smooth cables, because syphoners.

* RECAP: I think that should be it for converting and testing priority/satisfaction stuff. Up next is reworking the power monitor to display all loads (not just APCs) grouped by area, and each load's priority, as well as controls to edit a load's priority.

* Power monitor is in a workable state. Issues so far:
- It looks like ass. The "area details" buttons are ugly, and the priority dropdowns are uglier AND  fuck up the vertical spacing between rows
- Power connection machines (eg: radio transmitter) don't show up
- Setting an SMES priority low enough it won't charge means it won't appear on the list, so can't change priority back. other machines likely affected too

Still, it's taking shape

* Couldn't get priority dropdowns to look nice, switches them for buttons. Touches up the show/hide details button to look nicer

* Ensure normal power/connection machinery does show up by default

* Give artifacts BYPASS priority so xenoarcheologists don't have to wonder whether it's working or not (assuming there's enough power on the grid)

* Make sure any SMES do show up even if not charging, so you can raise their priority if need be

* Allow players to set the SMES' (until now unused) nametag, to better identify them on the monitor

* Review 1

* Review 2
Adds TOTAL_PRIORITY_SLOTS for clarity instead of using POWER_PRIORITY_EXCESS
2022-06-04 00:03:58 -05:00
kane-f
a725436c78 Smoother roid floors (#32672)
* Smoother roid floors

* Not needed or atomic

Co-authored-by: kanef <kanef9x@protonmail.com>
2022-05-29 20:10:37 +02: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
kane-f
a96b6fe439 Merges Emag() into emag_act() (#32501)
* Merges Emag() into emag_act()

* No not these

* Bots

* Updated comment

Co-authored-by: kanef <kanef9x@protonmail.com>
2022-05-03 16:33:29 -05:00
Hinaichigo
167f2110eb Update ores_coins.dm (#32510)
randomly initialize coin orientation
2022-05-03 16:33:19 -05:00
Eneocho
9a66689519 Revert "Changes ore smelted score to reflect ore value (#32374)" (#32393)
This reverts commit 98449dc150.
2022-04-14 01:33:05 -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
kane-f
98449dc150 Changes ore smelted score to reflect ore value (#32374)
* Changes ore smelted score to reflact ore value

* Better description

Co-authored-by: kanef <kanef9x@protonmail.com>
2022-04-12 23:01:32 +02: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
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
gurfan
12b68b9546 Electric Boogaloo (Take Two) (#31892)
* wall and floor and overlay icons

* HOLY SHIT PLANEMASTERS ARE AMAZING <3 LUMMOX

* nevermind shit is fucked i hate byond

* apc hackin tweaks start now

* attack_ai is overridden almost everywhere for zero reason

* more attack_ai shit

* more shit

* FORCEDISABLE pt. 1

* FORCEDISABLE pt 2

* more forcedisable 3

* 3.1

* end of forcedisable

* remove all hackview shit, cleanup

* better apc hacking, lots of fixes, and UI!

* more machine ability, lots of cleanup, radial lock updating, modules and active modules

* movable ui elements

* ADVANCED hologrmas

* more SHIT

* SHUNTSHUNTSHUNT

* fig congflgighgsa

* more testing

* fuck

* commit 2

* holo fixes

* fake APC images!

* lots of stuff

* fixes and cleanup and vomit

* More abilities. AI Control fixes and cleanup

* fixes

* fix

* clear another warning

* remove comment fix numbers

* raise price

* raise price

* fix

* 1 autoborger limit

* remove undocumented change

* handle at bot level

* order of operations

* dont call ert

* decrease

* fix unit test

* icon check please work

* remove unused icons, comment out chem dispenser drain

* comment out firewall, add disable to turrets

* remove unused wall icons

* Sort mob list, humans appear at the top

* fix sorting, fix hologram bug

* hologram tweaks, stupid fucking alert APC name

* qdel

* raise ever so slightly

* revert

* Delete broken_hand_icons.txt

* Update setup.dm

* Create setup.dm

* attack_self

* fix filter icon, delete unused file, remove forcedisable from magtape deck

* accidental change

* mousedropfrom recharge station

* oh rite

* fixo

* remove useless code

* aaahhh

* remove rig meal, made obsolete by emag

* fffffshhhhhhwooooop

* typo!
2022-01-31 18:18:06 -06:00
kane-f
a75773e2ea High shovel (#31755)
* High shovel

* High spear...

* Fixes sound code

* Fixes file path

* Removes var

Co-authored-by: kanef <kanef9x@protonmail.com>
2022-01-20 16:12:37 -05:00
DamianX
c5dffbe635 Revert "Electric Boogaloo (#31728)" (#31868)
This reverts commit 8bb40feca6.
2022-01-19 15:46:18 +01:00
gurfan
8bb40feca6 Electric Boogaloo (#31728)
* wall and floor and overlay icons

* HOLY SHIT PLANEMASTERS ARE AMAZING <3 LUMMOX

* nevermind shit is fucked i hate byond

* apc hackin tweaks start now

* attack_ai is overridden almost everywhere for zero reason

* more attack_ai shit

* more shit

* FORCEDISABLE pt. 1

* FORCEDISABLE pt 2

* more forcedisable 3

* 3.1

* end of forcedisable

* remove all hackview shit, cleanup

* better apc hacking, lots of fixes, and UI!

* more machine ability, lots of cleanup, radial lock updating, modules and active modules

* movable ui elements

* ADVANCED hologrmas

* more SHIT

* SHUNTSHUNTSHUNT

* fig congflgighgsa

* more testing

* fuck

* commit 2

* holo fixes

* fake APC images!

* lots of stuff

* fixes and cleanup and vomit

* More abilities. AI Control fixes and cleanup

* fixes

* fix

* clear another warning

* remove comment fix numbers

* raise price

* raise price

* fix

* 1 autoborger limit

* remove undocumented change

* handle at bot level

* order of operations

* dont call ert

* decrease

* fix unit test

* icon check please work

* remove unused icons, comment out chem dispenser drain

* comment out firewall, add disable to turrets

* remove unused wall icons

* Sort mob list, humans appear at the top

* fix sorting, fix hologram bug

* hologram tweaks, stupid fucking alert APC name

* qdel

* raise ever so slightly

* revert

* Delete broken_hand_icons.txt

* Update setup.dm

* Create setup.dm

* attack_self

* fix filter icon, delete unused file, remove forcedisable from magtape deck

* accidental change

* mousedropfrom recharge station

* oh rite

* fixo

* remove useless code

* aaahhh
2022-01-19 08:15:08 -06:00
SonixApache
e421a63d4f removes sleeps from coinflipping (#31863) 2022-01-19 07:19:08 -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
kane-f
e47d44250e Mining bar fixes (#31507)
* Mining bar fixes

* This too

Co-authored-by: kanef <kanef9x@protonmail.com>
2021-12-05 11:26:05 +00:00
kane-f
6809a08482 [MDB IGNORE] Reinforced floor tiling (#31366)
* Reinforced floor tiling

* Floor tile consistency stuff

* Nicer overlay

Co-authored-by: kanef <kanef9x@protonmail.com>
2021-11-24 11:04:20 -06:00
kane-f
31ec6d1da2 (Revival) Mining bar (#31284)
* Starting rework of this

* Slight fix

* Fixing compile issues

* Updating more code

* More updates

* More updates

* Proper name

* Removing unused comsig file

* Fixing up map

* Makes components work

* Make this show up

* Specific type, maybe?

* Vault fixes, plus makes component actually process

* Say proc finally works with events now

* Calling in wrong registered thing

* Unneeded

* Ports hearing to hear component

* Area exit phrase for him too

* Actual event

* Testing this out for fun

* Some more

* Compiles

* Path

* Disambiguates this

* No more runtiming

* Some cleanliness

* Makes this parsing less rigid

* This too

* Much much less rigid

* This shouldn't be in this then

* Make it rotate

* Here

Co-authored-by: kanef <kanef9x@protonmail.com>
2021-11-24 11:01:18 -06:00
kane-f
34f71abd6b Map element rotation fixes (#31315)
* Makes vault rotation a blacklist by default

* Makes this 0 by default

* Loading to Z2 with rotation too for testing

* Passes override to admin map element loading on z2 automatically

* Passes it in the right place

* Much saner way to do all this, plus enables some obviously working ones

* More tested vaults

* More that have no problems in rotation

* Mining stuff that can

* Snaxi stuff that can

* Two that can rotate

* Logging fix

* More detail

* Fixes terminals not rotating properly

* Makes these rotatable too, no issues

Co-authored-by: kanef <kanef9x@protonmail.com>
2021-11-18 11:09:52 -06:00
SonixApache
f900fc618e adds sleeps to coinflip to fix animation (#31305)
* adds sleeps to coinflip to fix animation

* illegal numbers begone

* how did this work in the first place
2021-11-18 11:08:16 -06:00
kane-f
0a808eca1e Changes z-level defines to map datum vars (#31268)
* Changes z-level defines to map datum vars

* Compile?

* Maybe now

* Map compile

* Updating these

* Adding this back again

* Nicer

Co-authored-by: kanef <kanef9x@protonmail.com>
2021-11-13 08:53:03 -06:00
kane-f
e547bfe934 Fixes auto mining (#31270)
Co-authored-by: kanef <kanef9x@protonmail.com>
2021-11-12 16:56:07 +01:00
kane-f
124ffc54d5 Buffs the fists of the rockernaut (#31244)
* Buffs the fists of the rockernaut

* Adds some knockout too

Co-authored-by: kanef <kanef9x@protonmail.com>
2021-11-11 21:06:53 -06:00
Exxion
472e49c833 check_contents (#31217) 2021-11-05 21:47:06 +01:00
DamianX
2ab8f80082 Ported Jump-Point-Search pathing from TG (#31114) 2021-10-26 00:30:38 -05:00
DamianX
a4438724c9 Changed all relative paths to absolute (#31078) 2021-10-18 16:28:55 -05:00
Shifty
7be042441a the meat of it 2021-09-18 14:25:35 +01:00
ShiftyRail
409ae193c2 The Postman always ring twice (#30551)
* Revert "Revert "Revert "Lights out tonight (trouble in the Heartland) (#30526)" (#30527)" (#30529)"

This reverts commit 5ae655387f.

* fixes urgent problems

* fixes the problem with zooming out

* gliding

* on the beach

* suffer not the lag

* fixes mesons and fire
2021-09-07 09:58:07 +01:00
Kurfursten
5ae655387f Revert "Revert "Lights out tonight (trouble in the Heartland) (#30526)" (#30527)" (#30529)
This reverts commit 2a0cec3fda.
2021-09-05 18:22:30 -04:00
ShiftyRail
2a0cec3fda Revert "Lights out tonight (trouble in the Heartland) (#30526)" (#30527)
This reverts commit eb21803691.
2021-09-05 17:14:55 -05:00