Commit Graph

286 Commits

Author SHA1 Message Date
buffyuwu
f935e30d58 Merge branch 'master' into agegate 2021-04-16 10:06:53 -04:00
FreeStylaLT
d05c025344 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13-rp into stares_at_booba_but_pretends_not_to 2021-04-02 08:24:56 +03:00
silicons
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
FreeStylaLT
3e257877b5 examine_look 2021-04-01 09:45:37 +03:00
Kraseo
681fd56de8 i am going to strangle silicons (#2856) 2021-03-22 12:50:09 -07:00
nik707
626ce8328b fixes meson eyepatch in loadout (#2849)
* e

* Update loadout_role_restricted.dm
2021-03-12 15:00:50 -08:00
nik707
bbdf9a9b39 Updates a donor sprite (#2846)
* e

* E
2021-03-11 12:59:55 -08:00
nik707
e7ae8e393d Aura's donator item (#2845)
* e.

* adds teshears for aura

* Revert "adds teshears for aura"

This reverts commit 385770da2a.

* Revert "Revert "adds teshears for aura""

This reverts commit be147c570e.

* Revert "Revert "Revert "adds teshears for aura"""

This reverts commit 6e62d7451c.

* fuck you github
2021-03-11 12:59:48 -08:00
silicons
8f192d6734 Merge pull request #2820 from drofoljaelisglis/LoadoutRevamp
Loadout Major Overhaul, Vox Sprite Fixes, Teshari Loadout Fixes, & Some New Clothes
2021-03-05 23:39:11 -07:00
nik707
6185af8bab VI's donator item, and a fix to secure briefcases included cus I'm scum and atomization is hard (#2819)
* E

* e

* e
2021-03-05 16:03:17 -08:00
Drofoljaelisglis
86c25e7477 Loadout Major Overhaul, Vox Sprite Fixes, Teshari Loadout Fixes, & Some New Clothes 2021-03-04 17:52:14 -08:00
silicons
2f17352d7c Merge pull request #2804 from nik707/patch-2
Allows Command Secretaries to spawn with the Command Bodysuit in loadout.
2021-03-02 17:00:34 -07:00
Captain277
40eca60e33 Merge pull request #2800 from nik707/donatorchair
replaces a donator item
2021-03-01 20:47:33 -08:00
Captain277
a3e2319aaa Merge pull request #2799 from nik707/donatormask
Adds donator item
2021-03-01 20:47:26 -08:00
nik707
6166501657 E 2021-03-01 04:48:17 -06:00
nik707
a893a2bf7b replaces loadout 2021-02-28 22:52:37 -06:00
nik707
5f6bddad6d Update loadout_donator.dm 2021-02-28 21:07:11 -06:00
buffyuwu
cd25cf3867 re-adds berets that vorestation removed 2021-02-28 12:10:51 -05:00
Captain277
050103666b Fixes permissions issue with loadout eyewear and drops pack prices. 2021-02-24 13:16:52 -08:00
Captain277
9c8470cae6 Merge pull request #2749 from silicons/matrix_recolors
adds matrix recolor gear tweaks to everything
2021-02-23 21:50:20 -08:00
silicons
727fcc9634 Update gear_tweaks.dm 2021-02-21 00:34:07 -07:00
silicons
35d86b12c5 Update gear_tweaks.dm 2021-02-20 16:51:39 -07:00
silicons
614df81c89 Update gear_tweaks.dm 2021-02-20 16:32:04 -07:00
silicons
c7de8722ef pretty 2021-02-20 02:42:20 -07:00
silicons
57864ff4c6 fix 2021-02-20 02:32:52 -07:00
silicons
76faa14170 ok 2021-02-20 02:24:06 -07:00
silicons
cede425e2b maybe 2021-02-20 02:19:03 -07:00
Captain277
2f52819d3c Merge pull request #2736 from silicons/event_prefs
replaces vorestation vore-vent preferences with a bitflagged event prefs with descriptions
2021-02-19 19:42:35 -08:00
silicons
d57608dd07 FUCK 2021-02-18 04:05:09 -07:00
silicons
fd30eae6fa FUCK 2021-02-18 02:21:09 -07:00
silicons
34509d1eca fix 2021-02-18 01:57:55 -07:00
silicons
a714eed095 event prefs 2021-02-18 01:53:35 -07:00
silicons
c1941ce6f1 Update loadout_head.dm 2021-02-16 15:45:41 -07:00
silicons
e0fe8e2c3c fixes 2021-02-15 05:18:35 -07:00
Captain277
46b4ef75c5 Merge pull request #2703 from silicons/init_1
fixes every single linter error (TESTMERGE THIS FIRST FOR THE LOVE OF ALL YOU CARE ABOUT)
2021-02-14 19:44:18 -08:00
silicons
dffbdbc609 fixes 2021-02-14 02:13:37 -07:00
silicons
a1a5bbc05e scream 2021-02-14 01:56:27 -07:00
Captain277
216a264a57 Just a fancy hat and sign. 2021-02-13 20:37:23 -08:00
Captain277
9f1168940a Partial accessibility. 2021-02-07 22:44:02 -08:00
buffyuwu
6642a4ac4c Merge branch 'master' into agegate 2021-02-07 01:12:32 -05:00
silicons
9601ec14b8 Merge pull request #2674 from Captain277/Final-Freeze-Fixes
Shuttle Engines Now Use Fuel and Eleven Other Things
2021-02-06 22:48:38 -07:00
Captain277
c70479f24e Merge pull request #2663 from buffyuwu/grammar1
Autocorrect
2021-02-06 21:46:18 -08:00
Captain277
dcb82acbca Updates, tweaks, and changes. Of course. 2021-02-01 00:10:44 -08:00
Captain277
b24bc5fc32 Merge pull request #2662 from Jaybirdnerd/Gameboi
[Event Reward] - Adds that Event Reward Gameboy I've been waiting on forever.
2021-01-29 13:58:48 -08:00
buffyuwu
53d9a66c99 thank u kevz 2021-01-28 08:19:32 -05:00
Jay
486f285b51 [Event Reward] - Adds the Gameboy I've been waiting months for. 2021-01-28 08:05:22 -05:00
ThatOneTeshari
2c13cc3529 Merge branch 'master' into SoundOverHaul 2021-01-28 01:09:48 -08:00
BlackMajor
73b3119218 Merge pull request #2644 from Captain277/Suits-and-Gear-Adjustments
Suits and Gear Additions/Adjustments
2021-01-28 20:33:51 +13:00
BlackMajor
b9ca176fc4 Merge pull request #2639 from Captain277/Minor-Bug-Fixes-Jan
Bugfix Round Up - January (Cakes and Cloaks)
2021-01-28 19:24:50 +13:00
ThatOneTeshari
9eb210a2b1 Merge branch 'master' into SoundOverHaul 2021-01-27 11:53:42 -08:00