Commit Graph

762 Commits

Author SHA1 Message Date
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
ShiftyRail
eb21803691 Lights out tonight (trouble in the Heartland) (#30526)
* Revert "spark machine (#30524)"

This reverts commit 7fc876a34d.

* Revert "This is why we can't have nice things (#30520)"

This reverts commit 6f7fbe95c1.

* Revert "Europa Lights 2021 - version 3 - wall shadows working edition (#30497)"

This reverts commit c03b442604.
2021-09-05 23:02:14 +01:00
ShiftyRail
c03b442604 Europa Lights 2021 - version 3 - wall shadows working edition (#30497)
* step1: compiles

* readds shadow atoms

* attempt at making spess dark

* planes fuckery

* forceMove fixes

* mouse opacity fixes

* moving to the europa light jargon

* rational brightness ranges

* re-adds moody lights

* sunglasses : compile check

* readds vampire vision

* No stacking of overlays, pt. 1/2

* makes wall shadows NOT ass

* toggle darkness

* compile

* sacrifice my firstborn to the linter gods

* test one

* uh

* europa lights mapping

* fireaxe cabinets

* Doing surgery on maps: deff

* removed herobrine

* map surgery: metaclub

* map surgery: synergy

* maps surgery, low fat bagel

* makes this compile

* more edge cases (haha)

* forgot these features

* blur: on

* wizzie den dark

* fixes the thunderdome
2021-09-05 13:54:34 -05:00
DeityLink
a6ddb23930 Reworked the Hostile mob friends list to use weakrefs (#30253) 2021-08-18 14:30:15 -05:00
DamianX
b46c7d3cbd Optimize server startup (#30175)
* Avoid creating objects just to delete them

* Avoid deleting turfs' floor_tiles

* defer station alert computer to initialize

* defer turf/New to initialize

* combine the two atom/New implementations to save one proc call

* Fixed maps using stupid types
2021-08-15 00:57:37 +00:00
kane-f
da528063d7 Refactors effect/effect into effect (#30138)
* Refactors /obj/effect/effect into /obj/effect

* Fixes these

* And these

* And these

* Fixes stuff not being clickable

* Fixes .dme real quick

* Removes now-redundant vars

* This too

Co-authored-by: kanef <kanef9x@protonmail.com>
2021-08-11 15:19:06 -05:00
gurfan
75516bb81c Update Alien Nest Mining Surprise (#30047)
* add and replace

* alien

* ripley wripley
2021-07-24 22:38:18 -05:00
kane-f
b715a2049c (Revival) Allows slime extracts to act as upgrades for stuff around the station (#29936)
* green slimes make a tray's plants immortal

* blue slime makes foam extinguishers dope again

* orange slime will provide a pepper spray with unlimited capsaicin

* adds missing return statements

* oil slimes attach to pickaxe type things and make them dig AoE

* fixes wrong type in attackby formal params

* black slimes can attach to a chemistry dispenser to make DD easier to cook up

* metal slimes let rpd's build pipes on all layers at once

* YOU WILL COMPILE

* makes multilayer work correctly

adds red slimes allow autowrenching

* socket wrenches can have a bluespace slime attached, which stops the gas from leaking out into the room

* changes the autowrench on RPD to yellow slime

* upgraded foam extinguishers now have 16K foam

* nerfs the pickaxe upgrade by 50%, now 1x3 like ripley

* slight name change so it fits on the chem dispenser ui

* Update code/game/objects/items/weapons/tools.dm

Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com>

* Update code/game/objects/items/weapons/tools.dm

Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com>

* Update code/modules/hydroponics/hydro_tray.dm

Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com>

* Update code/modules/mining/mine_items.dm

Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com>

* Update code/modules/RCD/RPD.dm

Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com>

* Update code/modules/hydroponics/hydro_tray.dm

Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com>

* variable changed name

* Testing out new slime_act() method

* Socket wrenches

* RPD, hydro trays

* Pepper sprays, pickaxes

* Chem dispenser, beginning rework of act function

* Now makes qdel work right

* Fix compile errors

* And another

* Aaand some more

* Maybe this?

* Oh

* Moves this up to object level, less redundant

* Refactor of has_slime check

* Indentation

* Indent fix

* pls pass test

Co-authored-by: tianyou <fuckgit@fuckyou.git.fuck>
Co-authored-by: hbycyl <36418376+hbycyl@users.noreply.github.com>
Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com>
Co-authored-by: 天佑 <meitianyou94@gmail.com>
Co-authored-by: kanef <kanef9x@protonmail.com>
2021-07-13 17:43:50 -05:00
kane-f
4bc6763c4d Allows forges to smelt ores (#29926)
* Adding heating process for ores

* And qdels

* Moar consistency

* Actual temperature logic

* Indent

* Redundant var

* Needs actual recipes, do this in some better way later

* Move temp check up here

* Now finally, make it appear right

Co-authored-by: kanef <kanef9x@protonmail.com>
2021-07-11 15:06:49 -05:00
DeityLink
bdfe03a599 fix planes (#29958) 2021-07-04 19:16:28 -04:00
kane-f
d00a03e146 New ghost verb: Become Space Hobo (#29808)
* Basis of this job

* The hideout

* More stuff

* Walling

* Start landmarks and APC

* .dme check

* Generation code

* Adding to init

* Tweak for later

* This is needed to compile

* Moving this here to see what it does

* Oh I got the filename wrong

* Saving it like this, maybe now it'll work

* Maybe this will help

* Oh right. Testing for box anyways

* And everywhere else too

* Shack tweaks

* Reformatting this

* Oh it's like this

* Starting tweaks

* And more

* Midround stuff

* Locking it from observers, ideally

* Removing more unused things

* More species

* Typo

* Config stuff

* Safe tweak

* Gives own ID type

* Tajaran outfit

* Redoing shack generation

Co-authored-by: kanef <kanef9x@protonmail.com>
2021-06-23 17:47:02 -05:00
beesil
a15bc726a8 Adds more mining surprises (#29815)
* adds more mining vaults

* fixes floors, anchoring, readds forge
2021-06-23 11:48:01 -05:00
DeityLink
2f6920c541 pomfcoin (#29859)
* pomfcoin

* pumf

* eh
2021-06-22 16:38:38 -05:00
Exxion
dba1ca7b0e Revert "Europa lights 2021 (#29551)" (#29851)
This reverts commit 4c25cd6b62.
2021-06-20 22:25:47 +01:00
ShiftyRail
4c25cd6b62 Europa lights 2021 (#29551)
* Mapping changes

* code changes

* conflicts part1

* icons

* wrong remote

* box compiles

* synergy

* fix linter

* review

* Documentation

* Packed mapping

* light tiles? idk

* Metaclub. God there's a lot of lights

* Reduced power costs

* Deff mapping update

* Synergy

* Dam's review

* Damian's review part 2

* linter

* maybe fix schrodinger's lights once and for all?

* the absolute icon_state

* grammar

* nevermind

* review

* gues

* europa lights roidstation (#10)

* Lowfat bagel

* last box touches

* i'm dumb

* klh

Co-authored-by: SonixApache <SonixApache@users.noreply.github.com>
2021-06-20 14:29:59 -05:00
DeityLink
4de61cde09 rusty abandonned crates (#29831) 2021-06-19 21:34:55 -05:00
DeityLink
e73fe2c1d9 Pianos in supply crates and Hydro Trays in mining surprises now come unanchored (#29810)
* loose trays

* piano
2021-06-19 21:21:45 -05:00
DeityLink
b9a28e5c23 Ore Unloader Revamp (#29809)
* Unloader Revamp

* loose pixels

* meh

* adjacency check
2021-06-19 21:19:55 -05:00
DeityLink
9e4ea6b66a Not more remote ore box unloading (#29743)
* not more remote ore box unloading

* hell

* derp
2021-06-12 00:36:02 -05:00