50 Commits
Author SHA1 Message Date
27553ac31b repaths spiderlings/vines to structures instead of effects (#7530)
- spider webs / vines should never have been effects in the first place
- spiderlings should probably just be mobs at some point lol

---------

Co-authored-by: Zandario <zandarioh@gmail.com>
2026-02-18 12:40:19 +00:00
siliconsandGitHub 60db51850c experimental gc / init fixes and optimizations, and fixes emotes (#7431) 2025-12-15 09:13:19 +01:00
Putnam3145andGitHub e048e61fd7 Well and truly fixes plant stacking (#7263) 2025-08-17 19:56:21 +02:00
siliconsandGitHub a83bdbcd61 renames setclickcooldown and get_attack_speed (#7126)
staging for melee PR, the way to modify cooldown is no longer direct
calls but modifying the clickchain
2025-04-30 10:14:43 +02:00
siliconsandGitHub e6f972666c regexes damage and wound types (#6735)
Different semantics demand different defines. It's hard to tell what's
being used where and for what reason right now.

Staging for combat PR.
2024-09-09 15:13:34 -06:00
siliconsandGitHub 0c8dd521c2 refactors attack hand proc header (#6720)
needed for #5677 

this is to make that PR slightly easier to review.
2024-09-06 13:36:10 -06:00
Putnam3145andGitHub 8fe4deb09e Prevents vines from infinitely spreading from below (#6423) 2024-05-02 08:32:16 +02:00
f00535983e [MDB IGNORE] [IDB IGNORE] atom damage (#5235)
## About The Pull Request

adds generic system for atom health / integrity / damage

everything that isn't flagged with not-bludgeonable can, well, now be
bludgeoned.

## Why It's Good For The Game

more interactive game world through the means of making people able to
break Everything.

## Changelog

🆑
add: atom damage - (almost) everything is now breakable.
refactor: new /atom level materials system
refactor: a lot of the combat system / click code
refactor: melee attack styles
/🆑

---------

Co-authored-by: silicons <no@you.cat>
2023-11-11 17:33:57 -07:00
siliconsandGitHub 6e0f7912b4 fixes plant stacking (#5903)
only took 5 months
2023-08-23 20:52:26 -07:00
siliconsGitHubVM_USER <VM_USER>silicons
fd5e67ff71 runtime maploading: fifth time is the charm (#5524)
Co-authored-by: VM_USER <VM_USER>
Co-authored-by: silicons <no@you.cat>
2023-06-15 19:21:14 +02:00
304bf65a9b mobility flags (#5202)
Co-authored-by: silicons <no@you.cat>
2023-04-22 19:32:16 +02:00
8b778b0321 Armor rework (#5158)
Co-authored-by: silicons <no@you.cat>
2023-03-25 11:58:25 +01:00
455ec82c4e refactors attack_hand, attackby, attack_self (#5120)
Co-authored-by: silicons <no@you.cat>
2023-03-11 17:15:58 +01:00
siliconsandGitHub a630f998b6 fixes a lot of gc issues with vines (#5144) 2023-03-08 12:54:27 -06:00
siliconsGitHubVM_USER <VM_USER>
a90d92df2b converts ex_act to legacy_ex_act, plants the seeds for new explosions (#4662)
Co-authored-by: VM_USER <VM_USER>
2022-11-02 20:45:16 +01:00
siliconsGitHubVM_USER <VM_USER>
bf62a62bab vehicle repath, piggybacking, firemanning, riding components, multiseat vehicles, buckling, probably other stuff (#4361)
* shit code goes in the comedy bin

* stubs

* move those

* w

* vehicle repath

* maybe that instead

* aouhgoawhuh3ho

* markers

* a

* fixes

* hell

* let the great refactoring begin

* a

* aouhg

* changes

* augh

* signals

* s

* offhand stuff

* wrappers

* stuff

* modifications

* a

* stuff

* base component

* Stuff

* a

* stuff

* ay

* Ay

* ?

* fix

* a

* augh

* aough

* mark those

* sigh

* correction

* that

* let the good times roll

* more

* more

* on god

* aoihgouh

* fixes

* done with that ifle

* sigh

* a

* s

* fuck off voremobs

* stuff

* pain

* some more

* changes

* changes

* f/r

* sigh

* impl

* out with the useless

* fix

* Fixes

* a

* fixes

* move that

* pain

* fix

* m

* pain

* WHY

* regex

* s

* just offsets to go

* reserve those words

* that

* stuff

* stuff

* not sure if list ops were a good ide abut whatever

* fix

* and once more with energy!

* and once more with energy!

* fixes

* offsets

* fix

* lmao!

* ay

* patch

* fixes

* propagate that shit through

* ayo

* bruh?

* e

* PLEASE END MY SUFFERING

* ah.

* that

* fix

* fix

* fixes

* e

* Fix

* fix

* fix

* Fix

* fix

* fix

Co-authored-by: VM_USER <VM_USER>
2022-09-29 22:13:03 -07:00
siliconsGitHubVM_USER <VM_USER>
6dec5d41e7 refactors pushing, movespeed, actionspeed, throwing, movement, pass flags, and probably things i forgot about; adds overhand throwing (#4360)
* initial

* wack

* changes

* insanity

* staging

* t

* note2self

* wild

* find replace

* changes

* pain

* fixes

* that's right out

* augh

* augh

* wild

* lol

* fuck this not refacotring all that in one day

* oopsy doopsy

* that goes away

* fixes

* pain!

* throwing stuff

* Fixes

* g

* eternal curse upon you, space indenter

* eternal curse upon you, space indenter x2

* real combat refactor energy

* refactors

* stuff

* subsystem logic

* a

* pain

* logic

* push logic

* logic

* i hate micros

* fixes

* a

* convert the rest

* let's finish this

* s

* fixes

* aah.

* augh

* AUGH

* stuff

* a

* more

* a
git pu

* fixes

* fixes

* fix

* fixes

* warnings

* more

* maybe don't have them throw past walls

* fixes

* ack

* f

* better ui

* fixes

* fixes

* a

* proximity monitors

* proximity monitors

* proximity monitors

* wack

* swap stuff

* a

* fix

* fix

* fix

* default

* Fix

* fixes

* ayy

* aoug

* aoug

* stuff

* fix

* fix

* ay

* ay

* ough

* ayo

* fix

* cannon

* wack

* i tested it

* fix

* why

Co-authored-by: VM_USER <VM_USER>
2022-09-08 01:43:03 -07:00
siliconsGitHubfake_vm_user <fake_vm_user>VM_USER <VM_USER>
934ad25bfe refactors: inventory, mousedrag, stripping, species bodytypes, inventory HUD, and probably some unrelated things (#4092)
* start

* i hate people who pack shit into one file

* sigh

* regex

* inventory rework

* stubs

* regex

* this is insanity

* oh no

* backend moment

* a

* changes

* wild

* regexing

* changes

* put in hands

* more errorS

* attackby

* more helpers

* replacements

* wild

* fixes

* pain

* fxies

* fixes

* unneeded

* ape

* ape

* wild

* wild

* more

* wild

* there

* fixes

* fixes

* l

* wild

* more

* moer

* fixes

* enough for todayd

* regexing

* long time coming

* shaking and crying

* end me

* fixes

* fixes

* e

* fxies

* rig refactor moment

* fixes

* fixes

* fixes

* fixes

* out with the shitcode

* thanks git

* partial rig rewrite here we go

* more

* fixes

* WWWW

* ok

* wild

* bitfield defines

* nobludgeon

* pain

* pain

* fixes

* more

* wild

* wild

* fixes

* pain

* move behaviorsr

* fixes

* next up, finishing core procs

* y

* .

* time to finish this

* time to finish this

* propagate accessories

* hate this accursed engine

* hate this accursed engine

* pain

* more

* cancer

* epic

* genuinely hate

* wild

* that

* why

* circuitry is my bane

* y

* how

* sort

* logging

* logging

* im dying

* fixes

* next

* f

* more

* epic style

* fixes

* on meta

* fix

* wild

* uh

* quirky

* fixes

* agh

* pain

* fixes

* fix

* sigh

* a

* epic1

* fixes

* ugh

* epic

* fixes

* uhh.

* is this even a fix

* fix

* fixes

* fixes

* we love optimization

* wear over system

* correct

* worn over stuff

* just augments

* coggy

* implant magnetic catch

* implant magnetic catch

* fixe

* a

* g

* t

* fix

* fix

* wack!

* fix

* a

* semantics

* fix

* that

* fixes

* handle denesting

* w

* fixes

* e

* bugs

* fixes

* fixes

* unit tests

* absolutely wild

* fixes

* fix

* fix

* fixes

* on god this is bad

* fixes

* fixes

* fix

* fix

* wacky!

* fix

* wack

* manual

* fixes

* closets

* OOPS

* wack

* pain

* pain

* flags

* regex

* fixes

* wakc

* changes

* more

* augh

* more

* replaces

* more

* that

* acc

* acc

* fix

* fix

* fix

* oh woops that was important

* wack

* epic

Co-authored-by: fake_vm_user <fake_vm_user>
Co-authored-by: VM_USER <VM_USER>
2022-07-29 00:20:47 -07:00
siliconsandGitHub 3085c68890 [MDB IGNORE] repaths landmark back to /obj because I apparently am an idiot (#4197)
* oops

* why

* here you go

* oops
2022-06-14 14:58:22 -07:00
siliconsGitHubfake_vm_user <fake_vm_user>
e88f63cd33 refactors some gun things (#4036)
* wow

* wack

* fix

* fix

* fuck you

* i am declaring war on gun devs

* fix

* fix

Co-authored-by: fake_vm_user <fake_vm_user>
2022-05-12 14:41:29 -07:00
siliconsandGitHub 268f34a804 small cargo code cleanup (#3941)
* move everything

* stuff

* done

* done

* i hate nanoui

* that

* listmaniia

* that

* okay that's a higgs bugson moment

* oh god git why

* a

* a

* fixes

* keyboard moment
2022-04-27 11:40:13 -07:00
ZandarioandGitHub db6eecce0c Science TGUI & More (#3901)
* Day 1

* Circuits, Bots, UAV

* Fixes

* Cleaning

* Finished Science

* e

* asdasd

* aesfesf

* Fix Medibots (including the bee one)

* Bleh

* Fixes RPD with some code improvements

* RCON Patch

* RCON PATCHES

* Rename popper.tsx to Popper.tsx

* Rename popper.stories.js to Popper.stories.js

* Yarn and Popper Updates

* I am going to shit bricks

* So Tired

* asdas

* Finally fixed tanks

* Radio is fixed

* Fixes Pipes

* RCD SCROLLING!

* Fixes Chat (because everyone uses hybrid???)

* Fixes bugged themes

* habhabahab - Fixes Air Alarm modes

* Fixes Medibot UI and UI Action Buttons

* Fixing say_emphasis missing on NIF messages

* a
2022-04-21 01:36:18 -07:00
663b919445 [IDB IGNORE] [MDB IGNORE] Tether - remade on cit repo so people can PR to this (#3043)
* Tetherport

* sigh

* more fixes

* shields

* more

* woo

* compile

* e

* a

* Tether, compilable and running

not playable tho

* Tether, compilable and running

not playable tho

* Automatic changelog generation for PR #3200 [ci skip]

* why

* EOL

* nukes edited areas. if you had something important in here, you didn't deserve to.

* another folder down

* one more folder

* the refacotring continues

* change those

* okay

* dynamic zlevels

* move stufF

* reorganize that too

* get rid of unneded archives

* move talon too and rename that

* meh

* woop

* fixes

* move those

* fixes

* fix

* Submap Repathing/Reconciliation

* Attempts to fix Gecko invalid variable bug.

* Alright. Let's actually fix every bugged instance.

* Another round of updates. That same turf issue exists.

* Should fix the last of those weird varedits.

* One snuck by?

* Another round of fixes.

* I want to know who put all these var edits in.

* Another batch down.

* Yet another batch.

* A map at a time, at this rate.

* I hope these are the last four, but probably not.

* Hopefully the last, but probably not.

* ANOTHER stealth var_edit that snuck through.

* Manually checked the rest of the map files I found. These were updated.

* Did the same for bad var_edits. Caught these.

* Updates the 140x140.

* Sorts Talon and partially adds Point Defense. Too complex for me.

* tether_turfs

* I think this is it. The last variable bug.

* Telenetwork Delenda Est

* linterS

* fix

* extraneous files

* woo

* mmm

* add that in until reagents hardsync

* woo

* sync

* updates

* t

* weather

* i want to rewrite telecomms

* test

* shift those

* woo

* move that

* FUCK

* Fix

* fix

* or null

* shuffle

* Fixes

* Fixes

* Fix

* fixes

* woo

* that

* facility safety

* that too

* move that out

* fixes

* woops /

* rename those

* those

* woo

* test

* fixes

* woo

* exploration map edits

changes oxygen tanks to o2 jetpacks, co2 jetpack to an o2, adds pathfinder voidsuit, suit cycler for medical, and fixes access restrictions on the PF's office and locker

* mh

* Update fueldepot.dmm

* woo

* woo

* woo

* fix

* utterly fuck you

* Automatic changelog generation for PR #3225 [ci skip]

* test code

* w

* that

* fieldgens

* better

* singulo

* fixes

* fix

* fix

* adds mirrortools, removes backup implants

* why

* Prevents falling through catwalks and lattice,
stolen from Silicons

* Lots of stuff!

* Update talon2.dmm

* Automatic changelog generation for PR #3226 [ci skip]

* Removes Mining Stacker

* Slight remap changes to Deck 3, pending more.

* Automatic changelog generation for PR #3228 [ci skip]

* fix that

* that

* R&D remap.

* Lighting fix and correcting a talon vault issue?

* Conflict clean-up.

* Multi-floor modifications. Chem change. R&D revert. Etc.

* Adds a few extra timeclocks.

* Missed the bioregens. Hooray.

* Re re readjusts R&D to a lobby design. Adds Space Spice. Maybe fixes Captain spawner.

* woo

* fix

* not that

* Xenobotany and Trash Pit adjustments.

* proper

* De-militarizes Talon. Will Trader-ify them when I wake up.

* fix

* fix

* ashet pls

* ashet pls v2

* cleaner

* cleaner

Co-authored-by: nevimer <77420409+nevimer@users.noreply.github.com>
Co-authored-by: CitadelStationBot <citadelstationcommunity@gmail.com>
Co-authored-by: Captain277 <agentraven16@gmail.com>
Co-authored-by: Mag <86886852+MonaraMir@users.noreply.github.com>
Co-authored-by: nik707 <38332985+nik707@users.noreply.github.com>
Co-authored-by: TheLordME <58342752+TheLordME@users.noreply.github.com>
2021-07-11 23:29:24 -07:00
siliconsandGitHub bc9f6a34ce Update spreading.dm (#3031) 2021-04-28 21:40:05 -05:00
siliconsandGitHub 472ef33488 nukes some unmanaged global variables (probably merge this fast as it touches a hundred+ files) (#2829)
* replacements

* indents
2021-03-07 19:01:45 -08:00
silicons e9acf212fb Merge remote-tracking branch 'citrp/master' into init_2-real 2021-02-25 03:24:11 -07:00
silicons 054cd3b652 holy fuck 2021-02-25 03:19:54 -07:00
Blake Inkpen c3723e4cd4 Further Updates
Adds Incorporeal to Shadekin's phase so they don't trigger step events or able to be shot while phased. Also adds portals in fully after fixing some errors.
2021-02-20 21:06:30 -08:00
silicons 0153874304 wew 2021-02-15 04:44:52 -07:00
silicons b3a4fa802b jfc 2021-02-14 03:04:42 -07:00
silicons d1cd094d03 holy crap 2020-10-03 21:48:10 -07:00
Anthony Rodriguez fdb6451889 Adjusted values of rats and vines a little 2020-06-19 13:22:22 -07:00
Anthony Rodriguez c2da3f5d33 Random Events Buffs 2020-06-16 18:42:03 -07:00
Anthony Rodriguez 67df8f307f Fucks sake STOP BEING OP 2020-05-07 22:19:50 -07:00
Anthony Rodriguez a8caebc62f Even FURTHER nerfing to vines spread speed JFC. And further reducing the ouchie 2020-05-07 17:46:12 -07:00
Anthony Rodriguez e932092658 OH GOD WHY ARE THEY STILL MURDERTOWN 2020-05-01 19:51:30 -07:00
Anthony Rodriguez c6febe3076 Re-adds other sprites again. Still bite though 2020-04-30 16:03:22 -07:00
Anthony Rodriguez 9619463932 Vines are no longer listening to eurobeat 2020-04-30 15:59:49 -07:00
Anthony Rodriguez 318c29731c Attempting to remove double damage 2020-04-29 16:26:54 -07:00
Anthony Rodriguez 62bde203f5 Travis agony 2020-04-29 16:19:22 -07:00
Anthony Rodriguez 3e4e8bca8b LOL WHOOPS ALL MURDER 2020-04-29 16:04:38 -07:00
Anthony Rodriguez 6c07c0593b Oh god vines got even more deadly omegalul 2020-04-28 22:47:39 -07:00
Anthony Rodriguez eb5a528f3d Fixing from >> to to_chat function 2020-04-27 19:49:28 -07:00
Anthony Rodriguez f3cb13535e Typo reeee 2020-04-27 18:54:49 -07:00
Anthony Rodriguez 6f82c88120 Un Hugboxes Space vines. Actual Level 7 threat now 2020-04-27 16:38:35 -07:00
kevinz000 b4ecf93d46 ok 2020-04-13 20:03:10 -07:00
kevinz000 e26025599c wew 2020-04-12 17:31:11 -07:00
kevinz000 d7ac8512f3 let's change a proc name 2019-09-08 19:09:09 -07:00
kevinz000 53df5c3115 5 2018-10-11 20:11:46 -07:00
deathride58 f1893fa0a0 initial commit - Straight pull from Virgo's master branch from 5/6/2018 at 6:00 PM EST 2018-05-06 19:05:49 -04:00