38 Commits
Author SHA1 Message Date
b1029a24f8 Power Cell Rework + Energy Weapon Rebalance (& misc changes) (#7438)
- all cells in the game are now small, medium, large
- super, hyper capacity cells, device, and weapon cells are all removed
- cells now have standardized variants, some of which are printable by
R&D
- energy weapons rebalanced
- **advanced energy guns and stun revolvers removed** - use the new
modular weapon system and microfission cells.

---------

Co-authored-by: silicons <silicons@silicons.dev>
2025-12-24 12:15:01 +01:00
10d2505338 TGUI update (from letterN branch) (#7244)
Co-authored-by: LetterN <24603524+LetterN@users.noreply.github.com>
2025-10-04 10:45:41 +02:00
siliconsandGitHub ac3e0a73a9 attack_self refactor (#6754)
Changes proc header
2024-09-16 13:09:37 -06:00
siliconsandGitHub 16c07e9e61 Projectiles reorganization and cleanup, impact effects, subtle EMP tweaks (#6741)
No gameplay changes except for EMP rebalancing.

Emps are now deterministic
Ion rifles now always hit for strength 2 instead of a probability tree
of strengths
EMP damage slightly lessened as this makes a lot of things guaranteed to
hit with strength 2 instead of 3
2024-09-13 10:09:49 -06: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 faa9eabcc6 regexes damage to damage_force on projectiles (#6734)
for clarity and standardization purposes; it's this way on /item
2024-09-07 19:26:28 -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
siliconsandGitHub 2533caefd9 combat code overhaul + projectiles v8: impact handling (#6579) 2024-09-02 20:34:27 +02:00
00807234b9 refactors asset subsystem (#6459)
refactors the asset subsystem to make it much more managed

adds support for 'deferred' assets for tgui, which will be later used
for things like tgui character setup and admin panels.
deferred means that it'll be 'sent in a timely manner after the ui
opens', as opposed to 'sent before the ui opens'

---------

Co-authored-by: silicons <no@you.cat>
2024-06-01 17:08:13 -06:00
39bc14bb4a reworks game preferences (characters v2 staging) (#6310)
Co-authored-by: silicons <no@you.cat>
Co-authored-by: LordME <58342752+TheLordME@users.noreply.github.com>
2024-04-08 12:44:30 +02:00
20f4c5c7ff tgui embedding hooks (#6212)
Co-authored-by: silicons <no@you.cat>
2023-12-26 22:49:06 +01: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
e1ddf62d06 Modular Computer Revival (#5542)
Co-authored-by: silicons <no@you.cat>
2023-07-22 16:14:00 +02:00
749818c1cf tgui loadout (#5680)
Co-authored-by: silicons <no@you.cat>
Co-authored-by: LordME <58342752+TheLordME@users.noreply.github.com>
2023-07-22 12:00:59 +02:00
15ba149d71 persistent pictures framework (#5589)
no player facing changes

makes pictures persistent. fixes up the character saving system too.

---------

Co-authored-by: silicons <no@you.cat>
2023-06-13 18:00:58 -07: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
siliconsGitHubVM_USER <VM_USER>silicons
fb429e51a4 KILLS STATPANEL (#4877)
Co-authored-by: VM_USER <VM_USER>
Co-authored-by: silicons <no@you.cat>
2023-01-11 09:12:35 -06:00
ZandarioandGitHub 38f1b6af54 99% of Overlays now use SSoverlays (#4847)
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
Silicons asked me too and he knows very well I'll do this dumb shit in
one sitting.
2022-12-15 05:53:18 -08: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
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 7152e7ff2a power standardization 1/??????? - power scales, SMES/cellrate/APC/powernet/god i'm dying inside (#4103)
* start

* about ready for conversions

* oh boy

* oh boy

* powernet procs

* draw power, surplus, avil, smes

* cellrate, smes

* cellrate, smes

* more

* wacky

* aa

* there we go

* Wild!

* ix

* more

* why

* between needs to die

* smart

* oh no

* fear

* f

* fixes

* i hate parentheses

* i hate parentheses

* fixes

* calc moment

* *pawstamp*

* acter

* i hate myself too thank you

* a

* wack

* cheat factors

* that

* fix

* recomp

* epic js moment

* fix
2022-05-26 01:27:14 -07:00
ZandarioandGitHub 03aacd017e PCUs and SR Connected Computers (#4040)
* PCU and Connected Consoles

* Clean this up
2022-05-14 06:45:56 -07:00
siliconsandGitHub 8d4fd18cc2 ghostroles (#3961)
* files

* obj

* mass ports

* ah

* wack

* that

* todo refactor ui intieract calls jfc

* all

* test case

* compile

* compile

* auxtools time

* wack

* debugger hook

* I LOVE YOU SPACEMANIAC THE DEBUGGER JUST SAVED MY LIFE
2022-05-01 01:26:52 -07:00
fake_vm_user c50558cf91 more 2022-04-26 22:37:22 -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 5823fb93e7 migrates to github actions + sync tgui to main's, removes a bunch of dead maps and code and reworks how submap loading is done (#2917)
* move phoronlock define

* t

* force rename

* nuke unneeded things

* don't do that

* tgui sync?

* changes

* unit testing module

* backend

* tools update

* aaah

* go and stay go

* path replace

* move everything

* toss out more stuff

* remove

* fine those can stay

* dependencies.sh

* ruin datum move + rename

* level assets why did you guys put the turfs in my atmosphers folder grr

* more moving

* basemap, force stuff

* fix that desync meme

* move more stuff

* move those too

* repath

* get rid of useless initializers

* hacky patchy

* reservations

* alright

* tgui

* changelog example

* checksum

* md5

* errors

* more

* turf empty

* stop

* fix

* bad kwarg

* let's get those in again

* alright

* rid of that

* huh

* newlines

* newlines

* folder

* mood

* woops

* readme

* might as well trim now

* let's go

* fuck it tether isn't being used anyways lol

* ok

* empty files go

* tether is demoted

* sorry but this goes too

* okay

* make that work too

* ok

* wow.

* whew

* Fix

* fixes

* ok

* sigh

* fix

* fix

* aah.

* rust_g logging

* update rust g file

* fix

* funny

* Fix

* map issues

* fix

* initialize hints

* solves some problems

* those too

* ok

* pills

* let's do that.

* hit that too

* runtime

* add that too

* alright

* fix

* fix

* fix

* Fix

* add

* fix

* wildwest, what have they done to you...

* do that too'
git push

* fixes

* fixes

* fixes

* pack this tightly

* let's not have empty files

* sigh

* fix

* FUCK OFF

* fix icon

* rip old mapmerge

* zz

* woo yeah woo yeah

* logging

* fix

* better logs

* GRRRRRR

* last commit??

* awful
2021-04-01 16:07:03 -05:00
silicons 67152f0a75 more 2021-02-22 01:29:49 -07:00
lolman360 706f97324f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13-RP into tgui4examinetake2 2021-02-15 16:56:36 +11:00
lolman360 7edcf15861 Merge commit '8dff7f07867d39f200619443d974adbba0a97737' of https://github.com/lolman360/Citadel-Station-13-RP into tgui4examinetake2 2021-02-15 11:46:22 +11:00
lolman360 a986b69737 Porting camera cnonsoles + getting them to work 2021-02-14 21:56:51 +11:00
silicons b3a4fa802b jfc 2021-02-14 03:04:42 -07:00
Letter N dece5cc3fb nanoui ui_interact -> nanoui_ui_interact 2020-11-25 09:52:09 +08:00
lolman360 3dfab3b3c4 oop 2020-10-06 10:09:12 +11:00
kevinz000 e26025599c wew 2020-04-12 17:31:11 -07:00
kevinz000 6c1c339191 Updates code to November 2019 Vorecode 2020-02-08 00:41:54 -07:00