93 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
siliconsandGitHub 60db51850c experimental gc / init fixes and optimizations, and fixes emotes (#7431) 2025-12-15 09:13:19 +01:00
siliconsandGitHub 6736ce43d5 bugfixes 3 (#7414) 2025-12-12 18:53:15 +01:00
siliconsandGitHub 8402a432dc refactors suit storage allowed + new vv bitfield system (#7381) 2025-11-04 10:19:15 +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 2533caefd9 combat code overhaul + projectiles v8: impact handling (#6579) 2024-09-02 20:34:27 +02:00
siliconsandGitHub 5134116de4 supply: supply pack datums, some reworks (#6599)
tl;dr refactors supplypacks to a new system

- all access locks yanked from crates other than the ones that actually
need to be locked
- preps system for reworks, translates stuff over to a new format
- adds unified subsystem parsing & support for other descriptors for
cargo crate contents other than typepath
2024-07-31 10:28:39 -04:00
siliconsandGitHub 48e5ea649e Action button refactor (#6557)
for future use in remote control indirection

Actions are now multiple owner single target

Adds a lot more handling for things
Generally, the HUD of a mob is going to be split into components.
2024-07-14 11:07:29 -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
383308a1d1 storage rewrite (#6284)
Co-authored-by: silicons <no@you.cat>
2024-02-17 10:08:35 +01: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
1dfc2cf2b6 Carry weight (#5791)
Co-authored-by: silicons <no@you.cat>
2023-10-12 11:04:59 +02:00
siliconsGitHubVM_USER <VM_USER>silicons
dd2e201d4a [MDB IGNORE] engineering 1/4: dynamic / procedural gases, XGM touchups (#5674)
Co-authored-by: VM_USER <VM_USER>
Co-authored-by: silicons <no@you.cat>
2023-08-18 21:18:13 +02:00
Timothy TeakettleandGitHub b55c9fcce9 fixes a handful of missing sprites (#5635)
## About The Pull Request
yes i directly edited the map file, what are you going to do, fight me?

fixes survival pod sprite
fixes memorial sprite
fixes emergency phoron tank sprites
fixes some grass sprites

## Why It's Good For The Game
we like sprites to be visible and also not have the missing texture icon

## Changelog

🆑
fix: fixes a handful of missing sprites
/🆑
2023-06-22 10:07:57 -07: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
6268313705 Repaths rigs to hardsuits (#5455)
I realized it's literally impossible to translate all of this code at
once. RIG suit code is just all over the place.

This lets me develop rigs from the ground up without conflicting with
existing code. Old rigs will therefore not be the same item or ecosystem
as new rigs.

---------

Co-authored-by: silicons <no@you.cat>
2023-05-06 01:57:53 +02:00
LordPapalusandGitHub 7b459ddef9 Finally, nitrogen. (#5369)
<!-- 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

Adds a trait, and supplies for those that choose it, to breathe nitrogen
instead of oxygen.

## Why It's Good For The Game

At this point, Why not? To quote Kevin "Open source." Please review my
PR.

## Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
mark your PRs to prevent unnecessary GBP loss. You can read up on GBP
and it's effects on PRs in the tgstation guides for contributors. Please
note that maintainers freely reserve the right to remove and add tags
should they deem it appropriate. You can attempt to finagle the system
all you want, but it's best to shoot for clear communication right off
the bat. -->

🆑
add: Nitrogen breathing trait - Neutral trait for everyone to choose.
add: A new mask - Opaque mask (filters oxygen out of air and looks
snazzy)
add: Emergency Nitrogen supply crate orderable at cargo - Uses OSS Crate
type.
fix: Fixes emergency nitrogen tanks having no sprites.

/🆑

<!-- Both 🆑's are required for the changelog to work! You can put
your name to the right of the first 🆑 if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
2023-04-16 08:44:10 -07:00
nik707andGitHub ab14326de3 removes audio alerts when examining tanks that are low (#5222) 2023-03-25 21:27:01 +01: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
2ac1c566b8 access refactor, head of staff id mod consoles, tgui modules, this is a cry for help (#5040)
Co-authored-by: silicons <no@you.cat>
2023-02-28 17:35:44 -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
ZandarioandGitHub 150fdc0907 Tooltips Galore! (#4679) 2022-11-25 20:00:33 +01:00
ZandarioandGitHub ed05e01a95 __HELPERS Cleaning and other things I decided to do. (#4584)
* Schizoposting

* The Crungly

* Tabbin' the JSON y'all

* Strings
2022-10-21 01:56:59 -07:00
siliconsGitHubVM_USER <VM_USER>
93631c3339 [IDB IGNORE] reworks item rendering (again) (2/4) (#4483)
* reworks reworks reworks

* s

* s

* e

* don't need that anymore right aha

* i'm lazy

* optimizations

* fix?

* aough

* fix

* fix

* fix

* better

* aough

* aough

* howmegalul

* epic

* optimizations

* augh

* ough

* sigh

* wow time for a fucking slowdown

* ough

* why

* why

* ough

* .

* sigh

* fix

* wip

* this is quickly going out of control

* why are we here, just to suffer?

* here we go again

* pain

* i'm impressed by how shit this code is

* d

* oh no

* oh no

* stuff

* aaa

* ayy

* groan

* hm

* proggers

* a

* that solves that

* ough

* kick that out

* t

* ough

* example item time

* convert

* WHY

* I HATE CATGIRLS

* a

* genuinely awful

* more

* t

* sigh

* staging

* stuff

* pain

* SIGH

* sigh

* more

* AAAAAA

* more

* please

* fuck it flag time

* autodetect

* a

* mistake time

* why

* coloration2

* prog

* now just for detection and icons

* vestigal

* move those

* fuck byond

* wryyyy

* repath

* a

* aough

* surprisingly well

* let's go..

* fix

* there

* a

* fixes

* fixes

* Fix

* fix

* fixes

* fixes

* that was a bad idea

* later

* tesh fixes

* e

* fix maybe

* fix maybe

* fixes

* how?

* c'mon

* here we go again

* gfi

* fix

* unreal

* Fixes

* epic

* gfi fixes

* gfi fixes

* why

* come the fuck on

* useless files

* finalized GFI

* rly

* fixes

* sorry

* come on.

* eh

Co-authored-by: VM_USER <VM_USER>
2022-10-13 11:23:53 -07: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>
bffcb7810d at what point does our ZAS implementation become sunk cost (#4409)
* begin

* wip

* stuff

* aough

* stuff

* fix

* fix

* ayo?

* space

* fix

* more

* aough

* sigh

* maybe

* a

* a

* don't need that

* that

* fix

* fix_maybe

Co-authored-by: VM_USER <VM_USER>
2022-09-15 14:37:26 -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
ZandarioandGitHub 02f546f3f9 [IDB IGNORE] [MDB IGNORE] Clothing Repaths & a some new sprites (#4098)
* Part 1

* WHEW

* Duffle Fixes

* Deletes some no name sprites so I have less pain

* agh
2022-05-23 13:49:44 -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
siliconsGitHubfake_vm_user <fake_vm_user>
abe3121303 important and destructive change to the concept of species (#3991)
* species stuff

* initial

* that

* more

* more

* more

* more

* more

* why

* sorry

* more

* wack

* sigh

* wack

* wack

* more

* pain

* pain

* how

* another goddamn regex

* another goddamn regex

* get that

* IM DONE WE ARE NOT DOING THIS AGAIN

* how about we be able to debug it fuck you

* please just let me debug properly

* fix

* paper

* keys

* my god species need a redo

* Yikes.

* why..

* fixes

* fix

* 'cmon bro..

* wack

* wack

* fix

* WHY OH WHY MUST YOU DO THIS TO ME

* wacky

* that

* that maybe

* that maybe

* that maybe

* fix

* wacky!

* Wack

* wack

* epic

* damnit zandario

Co-authored-by: fake_vm_user <fake_vm_user>
2022-05-11 01:29:33 -07:00
siliconsGitHubfake_vm_user <fake_vm_user>
b335fa012a atmos cleanup - turf API, repaths (#3909)
* initial

* wack

* even more wack

* wack

* wack

* e

* lower

* wack

* wack

* more

* wack

* fix

* wack

* force git to recheck

* fixes

* fix

* wack

Co-authored-by: fake_vm_user <fake_vm_user>
2022-04-21 21:09:44 -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
Captain277 1f6a252658 Miscellaneous Recipes 2022-02-04 18:50:01 -08:00
ZandarioandGitHub 9432ea083f Reorganizing Flags and making them somewhat consistent with Main (#3330) 2021-08-14 21:20:41 -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
nik707andGitHub 82e0013f1b The great de _vr-ening. Part one. (#2933)
* first pass

* pass 2

* e

* Update vorestation.dme
2021-04-20 11:38:00 -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 054cd3b652 holy fuck 2021-02-25 03:19:54 -07:00
silicons ac7cb45b28 fixes 2021-02-25 02:29:52 -07:00
silicons 5edda181ad more 2021-02-21 23:07:23 -07:00
silicons 857846c8bf Merge remote-tracking branch 'citrp/master' into init_2-real 2021-02-21 22:34:43 -07:00
silicons c3de692726 let's do that 2021-02-21 22:17:30 -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 7dd8143386 fixing icons!! 2021-02-15 13:41:04 +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
silicons b3a4fa802b jfc 2021-02-14 03:04:42 -07:00