Commit Graph

415 Commits

Author SHA1 Message Date
Enric Gabriel f759503b49 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-22 20:30:49 -03:00
MrJWhit dc61b0fbd7 Captain Plasma -> Mumkey Jones 2020-08-19 23:25:27 -04:00
MrJWhit 92a664bb68 Update engine_teg.dmm 2020-08-18 04:32:47 -04:00
MrJWhit 5adb1c75d5 Update engine_teg.dmm 2020-08-18 03:45:37 -04:00
Enric Gabriel cf2c21ea52 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-17 12:06:32 -03:00
Detective Google 016fd2ac3c woo yeah yeah woo 2020-08-15 23:55:52 -05:00
Enric Gabriel bae8c236f6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-09 18:34:33 -03:00
Letter N 186482ecef map fix 2020-08-09 19:50:45 +08:00
Enric Gabriel 30e7b6c815 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-06 14:38:37 -03:00
dapnee cb17ea4874 More Active Turf Fixes
None of these nerds make their map names logically and it's hard to find which is which wihout going through a hundred of them.
2020-08-04 12:16:29 -06:00
Enric Gabriel 656dbe6d06 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-02 17:41:21 -03:00
Lin 0c85e3f127 Merge pull request #12989 from dapnee/why-is-box-even-fucked-like-this,-smh
You Thought I Was Done Fucking With Box BUT YOU WERE WRONG!
2020-08-02 12:50:34 -05:00
Enric Gabriel 372b486daf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-01 10:07:19 -03:00
dapnee 825ac6124b missed a tile
oopsy
2020-07-31 16:29:25 -06:00
dapnee e197cb44b2 You Thought I Was Done Fucking With Box BUT YOU WERE WRONG!
Fixed active turfs from plating that sat in space, removed random catwalk to nowhere, turned the medical console in the sleeper room to not face a window, FIXED MAINTENANCE BAR APC NOT ACTUALLY BEING FOR THE MAINTENANCE BAR. As well as fixed the xeno hive ruin on lavaland from having active turfs.
2020-07-31 15:37:40 -06:00
dapnee dcf3155b7f Map Edits Three: The Mappening
Fixes active turfs in wizard ruin that spawns in lavaland and ones on the space hermit asteroid. Fixes delta missing APC's for botany, the pool, and the little lounge area before toxin's testing site. And a light to the server room so it's not pitch black in there.
2020-07-30 16:29:04 -06:00
Enric Gabriel 48f8a998d5 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-07-27 10:33:25 -03:00
dapnee 8fbdc6257c Update listeningstation.dmm
it's a fan
2020-07-26 18:26:52 -06:00
Enric Gabriel d312fbc4db Mining update (#30)
* smol mining update

* Revert "smol mining update"

This reverts commit 9a0bd466ff.

* the .wav files i will use

* the rest that is being added for now

* fixes your stuff

* makes the crusher purchasable

* fixes legion's trophy

* so many icons and oggs

* SIF and more icons

* even more icons, sorry

* new modkits, yay

* oh come on, it didn't update

* some bosses seen to be ready

* Glory Kill system, should work just fine

* even more icons, jeez, also, elite mods

* oh hey, i got the icon

* almost done

* icons and meme dragon

* it's icon was hidden and i didn't notice

* why do i hear boss music ?

* one day...

* while Nano was...

* not continuing that

* stole some compatibility stuff

* the end is near

* some stuff to make stuff work

* probably one of the last commits

* king goat itself

* THE ERRORS, THEY'RE EVERYWHERE

* so close...

* the new ruins should spawn now

* should be the last commit, let's test it

* Now The Gladiator actually exists

* make them mad, and toggle their music

* oh, wait, need to give you the new files

* i think i saved someone's ears

* missing areas, i'm sorry

* good luck fighting KG without a ladder

* just leave a comment, nothing else

* fixes double spawn at least for hiero, aka why the fuck make two of the same proc and not remove 1st

* invisible hat, not anymore

* takes some stuff before bob even merges it on theirs

* how did these icons disappear ?

* fixes some oopsies

* sand plz help

* *fixes your thing*

* and i think i fixed the other

* fixes

* no async needed

* im done, just merge this useless thing

Co-authored-by: crazyraio2 <44246096+crazyraio2@users.noreply.github.com>
2020-07-25 20:04:07 -03:00
Enric Gabriel f0904c6b10 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-07-21 01:19:25 -03:00
silicons 267186a5d3 Merge pull request #12646 from Chiirno/emi
[READY] Alt-click cigarette pack functionality added to pill bottles.
2020-07-20 16:15:38 -07:00
Enric Gabriel 05593f84a0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-07-16 22:13:13 -03:00
crazyraio2 7e1712ebb3 i don't know 2020-07-11 18:13:40 -03:00
Artur 9de8483bcf Merge remote-tracking branch 'Upstream/master' into TGUI-3.0 2020-07-09 22:14:20 +03:00
crazyraio2 52ab79465b good syndi base, yes 2020-07-09 13:54:31 -03:00
Enric Gabriel 3cba98b3ff Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-07-08 21:31:37 -03:00
Ghommie 562b57095d mowing down the experimental cloner copypasta. 2020-07-05 03:04:53 +02:00
Cirno 020da9fa07 i hope this works 2020-07-04 15:47:38 -03:00
Enric Gabriel 7b991331eb removes something that breaks travis 2020-07-04 13:11:07 -03:00
Artur 6ee1eba56c Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-07-02 23:23:47 +03:00
Enric Gabriel 9c5a13d6d7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-07-02 02:19:34 -03:00
Enric Gabriel 67777c41e8 fixes stuff with old path? 2020-07-02 00:39:56 -03:00
silicons 27f7224d4d Merge pull request #12407 from Trilbyspaceclone/lavaland-ruin-tweaks
Much better looking lava land ruins!
2020-07-01 16:11:06 -07:00
Enric Gabriel f5bd261e38 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-06-30 22:01:51 -03:00
crazyraio2 c25d0b3e84 Gotta fix some stuff eh ? 2020-06-26 19:13:55 -03:00
crazyraio2 99796a4e81 Better Charlie Station 2020-06-23 13:09:14 -03:00
Ghommie de77b7139c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-06-23 00:13:14 +02:00
Artur aff4e5f93f Linter fixes 2020-06-22 17:58:52 +03:00
SmArtKar 170a38a3a7 Porting sutures and meshes from /TG/ (#12532)
* Porting sutures and meshes from /TG/

* Recipes fix
2020-06-16 16:22:56 -07:00
TrilbySpaceClone 6a008d2944 Kevs requests 2020-06-14 06:03:13 -04:00
TrilbySpaceClone dee7fc67eb Update lavaland_surface_sloth.dmm 2020-06-01 19:50:44 -04:00
TrilbySpaceClone fa71523cdf even better founten! 2020-05-30 22:09:06 -04:00
TrilbySpaceClone 48e9e54466 much better looking! 2020-05-30 21:07:14 -04:00
Ghommie 1bca74465f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-05-30 03:29:02 +02:00
Ghom 85186a9714 Porting updates related to material datums. (#12317)
* Porting updates related to material datums.

* art_type

* oh oh
2020-05-25 14:21:00 -07:00
EmeraldSundisk da772b9cb7 Adds the "Space Diner" space ruin. (#12337)
* Create spacediner.dmm

* Update spacediner.dmm

* Update spacediner.dmm

* Conversion.

* Adds the beacon and APC.
2020-05-24 13:11:49 -07:00
Ghommie a84e7bcecc Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-05-24 04:00:51 +02:00
Ghom ed90c59d65 Removal of """silk""" (#12221)
* Removal of """silk"""

* AAA

* Ashwalkers now start with durathread seeds
2020-05-19 23:43:46 -07:00
Ghommie 30ab79e09e Porting the twohanded component. 2020-05-17 18:16:53 +02:00
Trilbyspaceclone b21fb97bda Some fixes, some addtions some harm - Ice box changes (#12147)
* Some fixes, some addtions some harm

* Update icemoon_surface_engioutpost.dmm
2020-05-15 07:54:25 -07:00