Commit Graph

74 Commits

Author SHA1 Message Date
silicons
e4ec91faab that 2022-02-12 22:35:41 -07:00
Captain277
f0f7082ae5 Full Translation 2022-02-08 16:51:50 -08:00
Captain277
ba03c272e8 Not so much a chonker as a...honker. 2021-10-09 23:47:50 -07:00
Captain277
4ff72bd54b Honker and Cluwne mecha mobs. 2021-10-03 16:27:06 -07:00
silicons
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
nevimer
0b279ec943 softens chat colours for eye pleasure (#3123) 2021-05-26 02:26:40 -07:00
buffyuwu
5eeb87bb5e Merge pull request #2938 from MalricB/weaponsounds
makes weapons sound beefier
2021-04-13 00:37:31 -04:00
CygnusB
4bd1b5670d alien laserguns (?) sounds
why is it named beam/cyan wtf
2021-04-05 19:49:45 -03:00
CygnusB
b96cb9c99e we pog
a little bit
2021-04-02 13:54:37 -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
silicons
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
f222df7d8c fixes 2021-02-25 03:23:15 -07:00
silicons
2878c443e0 ok 2021-02-22 02:26:37 -07:00
silicons
c3de692726 let's do that 2021-02-21 22:17:30 -07:00
Captain277
e3325abcf6 Creates a Disabler subset so we don't erase stun beams entirely. 2021-02-19 01:46:32 -08:00
Captain277
ccea902bac Fixes the coloration on the beam and in-hands. 2021-02-19 01:40:56 -08:00
Captain277
e74f24ee4d Taser rework test number one. 2021-02-18 23:14:45 -08:00
silicons
b3a4fa802b jfc 2021-02-14 03:04:42 -07:00
BlackMajor
159a0153b1 Merge pull request #2625 from Captain277/Accuracy-Test
Buffs/Adjustments to Anti-Cult Weaponry
2021-01-22 13:48:42 +13:00
Captain277
0d3787295b General buffs to anti-cult weaponry. 2021-01-17 13:28:09 -08:00
Captain277
7b855751dc Realized multiple unversioned files were not committed. 2020-12-21 11:42:26 -08:00
Captain277
d85f859eba Ei Nath! 2020-12-21 09:43:02 -08:00
Vail
620e9d744e final changes pending feedback 2020-12-05 05:28:17 -05:00
Vail
a92f9198ee More balances 2020-12-04 00:54:17 -05:00
Vail
b77235c406 Accuracy, hitscan to not, and damage changes 2020-11-23 20:04:59 -05:00
Vail
a8f0732b2b New 7.62/Phase Bolt fix 2020-11-02 05:52:32 -05:00
Captain277
7384b87fdd Stand by. 2020-10-10 19:03:51 -07:00
silicons
d1cd094d03 holy crap 2020-10-03 21:48:10 -07:00
Hatterhat
0d36c49926 balance pass 1 2020-09-26 02:21:06 -05:00
Hatterhat
98efe1df3e bingo bango bongo 2020-09-19 11:45:02 -05:00
Hatterhat
41f7f39ed2 the plutonia experience 2020-09-19 00:57:38 -05:00
CharlesWedge
482f05f82c Update bullets.dm 2020-09-13 20:20:23 -05:00
CharlesWedge
6dc9cd1bd8 Silver Bullets Now have the right variable 2020-09-13 20:06:52 -05:00
CharlesWedge
bc7b6a34df Silver Bullets are now Holy 2020-09-13 19:48:36 -05:00
CharlesWedge
9985de42aa Removing Anti_Magic for now
Until I am certain exactly what we are doing for cult killing stuff
2020-09-10 21:46:53 -05:00
CharlesWedge
bb685cb81e Update bullets.dm 2020-09-08 19:48:42 -05:00
CharlesWedge
77e6b9ef2e Silver Bullet Base Data/Hunter Ammo Rework 2020-09-08 19:46:35 -05:00
CharlesWedge
f0829422cd Update energy.dm 2020-08-18 09:34:45 -05:00
VailTheAvali
4138cec83f Hunter rounds now with less post FF surgery 2020-08-13 14:03:41 -04:00
VailTheWolf
6a98a12cf4 Update bullets.dm 2020-08-11 14:03:42 -04:00
VailTheWolf
91bdb39dae Update bullets.dm
Adds hunter ammunition for 9mm and .45.
2020-08-11 11:48:23 -04:00
lolman360
176e972488 Merge branch 'master' into electrograph 2020-07-12 13:24:08 +10:00
Zandario
34174e31e9 Ports Polaris/pull/6558 2020-07-02 14:27:38 -05:00
lolman360
3d054c4fd0 wew 2020-06-24 17:10:33 +10:00
lolman360
497d6cd632 wee 2020-06-22 12:25:22 +10:00
lolman360
00fdadf1c9 sigh 2020-06-10 20:55:44 +10:00
kevinz000
724cb9adba Merge remote-tracking branch 'citrp/master' into diagonal_movement 2020-04-19 20:37:11 -07:00
kevinz000
2d300d6c2f typo 2020-04-19 06:19:21 -07:00
nik707
cda0fd74a2 Merge pull request #1869 from lolman360/phoronbore2
If the Phoron Bore is so good, why isn't there a Phoron Bore 2?
2020-04-18 00:34:15 -05:00