50 Commits
Author SHA1 Message Date
LetterN 292f67e098 Merge remote-tracking branch 'origin/master' into perlin-genny 2021-03-20 20:36:56 +08:00
Letter N 935e46b492 The Mapping Update
Cleans up the map (again)
Makes mining code more better
2021-03-12 12:11:35 +08:00
Letter N 69a054826b add art areas on meta, and adds lapvend on box,delta,meta.
Other map changes are cosmetic.
2021-03-10 16:34:37 +08:00
Letter N b3bfeb9858 it does not exist 2021-02-16 20:42:42 +08: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
SmArtKarandGitHub 170a38a3a7 Porting sutures and meshes from /TG/ (#12532)
* Porting sutures and meshes from /TG/

* Recipes fix
2020-06-16 16:22:56 -07:00
Ghommie 30ab79e09e Porting the twohanded component. 2020-05-17 18:16:53 +02:00
Ghommie e0a51903a1 Not yet implemented design security level requirements. 2020-04-24 00:51:04 +02:00
Sishen d7fdaed181 Fixes the Oldstation Tile 2019-05-30 15:45:17 -04:00
Tupinambis 338a98972f Makes the ruin more of a challenge. 2018-11-16 22:34:34 -06:00
Tupinambis bfe8fda260 Makes hivebots more robust. Makes oldstation not have an excessive amount of hivebots. 2018-11-15 20:25:06 -06:00
Poojawa fa70720cc1 Map Conversions 2018-09-11 08:58:34 -05:00
deathride58andkevinz000 2f9e3e403d Hard upstream sync (#6951)
* maps - none of our changes included yet i'll get them in after i finish up the rest of the sync

* sync part 1 - underscore folders in code

* controllers folder

* datums folder

* game folder

* cmon, work

* modules - admin to awaymissions

* cargo to events

* fields to lighting

* mapping > ruins

* rest of the code folder

* rest of the folders in the root directory

* DME

* fixes compiling errors. it compiles so it works

* readds map changes

* fixes dogborg module select

* fixes typo in moduleselect_alternate_icon filepath
2018-05-31 16:03:18 -07:00
Jordan BrownandCitadelStationBot deddd8debe Merge pull request #37622 from ShizCalev/cockarock
Changes cockroach guts to insect guts
2018-05-03 08:42:46 -05:00
kevinz000andPoojawa 3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
Poojawaanddeathride58 5fa001c10f things with stuff (#6233)
* buncha things from upstream

* datums globals, onclick

* datums

* game folder, holy shit mirror bot why

* modules

* icons

* dme

* compiles cleanly

* tools purge

* updates maps

* double check just because. and wew lad

* incidentally, this needs more work first

* some things

* weh

* sound cleanup and icons

* reeeee

* compile issues

* oh look, fresh code sync

* cleans up some unused icons

* dirty vars

* reeeeeeeeeeeeeeee

* wew lad. fuck off with this already
2018-04-07 23:07:09 -04:00
PoojawaandGitHub 6c7da493d9 Reee mirror bot. Hard syncs some missed PR stuff + maps (#5951)
* maps and tgui

* missed defines and helpsers

* controller things

* datums

* game folder stuff

* module things

* icons

* stragglers

* map sync and updating

wew lad
2018-03-14 16:49:40 -05:00
kevinz000andCitadelStationBot 91ac70a73e RND TECHWEBS: TECHFABS (#36055)
Doing my little update piece by piece because I'm lazy and because storage PR is going to conflict everything ever.

Techfabs do not link to RND consoles, and have their own interface for producing things.
RND production machinery code refactored.
Techwebs have categories views instead of just a goddamn design list.
Old machinery will be kept in, as some places will keep them. Read: Engineering, robotics, etc.

experimental: Protolathes and circuit imprinters combined/changed to techfabs. All departments can now print related circuit boards. Engineering and science will keep their lathe/imprinter design by default at roundstart because they have specialized labs for those.
2018-03-07 21:11:56 -06:00
PoojawaandGitHub 7d488e8f4c Citadel'd Maps from #5523 (#5551)
* #5523 commit + sanity upload

* reee

* Syncs home brew CItadel changes

* updates cit_map_files

* reee.
2018-02-17 18:04:28 -06:00
AnturKandCitadelStationBot 35b8e410be html_interface removal and crew monitoring console refactor. 2018-02-15 14:31:27 -06:00
CitadelStationBotandPoojawa 7126b61205 [MIRROR] Return of ore stacking, various changes to lavaland bombs to facilitate reduced lag (#5327)
* Return of ore stacking, various changes to lavaland bombs to facilitate reduced lag

* really? Like, a dozen fucking map conflicts. this map was fucked entirely
2018-02-06 19:06:31 -06:00
CitadelStationBotandPoojawa 5385333a64 Fixes some broken accesses (#5287) 2018-02-05 02:25:16 -06:00
PoojawaandGitHub 03086dfa91 Tg 1 28 sync testing/confirmation (#5178)
* maps, tgui, tools

* defines and helpers

* onclick and controllers

* datums

fucking caught that hulk reversal too.

* game and shuttle modular

* module/admin

* oh god they fucking moved antag shit again

* haaaaate. Haaaaaaaaaate.

* enables moff wings

* more modules things

* tgstation.dme

before I forget something important

* some mob stuff

* s'more mob/living stuff

* some carbon stuff

* ayy lmaos and kitchen meat

* Human stuff

* species things

moff wings have a 'none' version too

* the rest of the module stuff.

* some strings

* misc

* mob icons

* some other icons.

* It compiles FUCK BORERS

FUCK BORERS
2018-01-29 04:42:29 -06:00
deathride58 d8facb3bce initial commit - game folder + maps + dme 2018-01-03 22:52:38 -05:00
CitadelStationBotandkevinz000 cc0b768c72 [MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014)
* [READY] RND TECHWEBS + DEPARTMENTAL LATHES

* resetting all the maps because we can worry about them later.

* Regexing

* I'm fucked

* Fixes

* .

* maps

* bleh

* ree

* fixes
2017-12-11 16:36:38 -08:00
uraniummeltdownandCitadelStationBot d6b0683846 Airlock Construction Update 2017-12-10 15:23:34 -06:00
Mark9013100andCitadelStationBot fb4787fbd1 Oldstation edits/fixes (#33080) 2017-11-26 00:01:21 -06:00
ACCountandCitadelStationBot 2147c60b7f Replaces "console screen" stock part with glass sheets 2017-11-23 18:53:47 -06:00
ShizCalevandCitadelStationBot 2c65f5c6b5 Fixes dynamic lighting / nearstation area issues. 2017-11-21 08:41:54 -06:00
WJohnandCitadelStationBot e8ddae5d98 Cleans up floors.dmi a bit and adds new turf decals. 2017-11-20 20:48:06 -06:00
deathride58 fb62491701 manual map syncs + manual missed pr mirrors 2017-11-17 21:34:49 -05:00
ShizCalevandCitadelStationBot b89cedcb08 Cleans up wire varedits (#32427) 2017-11-05 17:36:31 -06:00
WJohnandCitadelStationBot 1e32be17ec Expands ancient station map areas (#32391) 2017-11-04 11:20:21 -05:00
ACCountandCitadelStationBot a3783943a7 Internal map improvements (#32310)
* Internal map improvements

* More map sheet fixes

* PubbyStation fix

* More map fixes
2017-11-02 01:23:30 -05:00
Jordan BrownandCitadelStationBot b1c26daf8b Merge pull request #31507 from ShizCalev/varedit-cleanup
Cleans up warning line varedits
2017-10-10 13:29:48 -05:00
CitadelStationBotandPoojawa 83ec9b6d26 [MIRROR] Cleans up showcase & plaque varedits, updated loyalty implant references (#2768)
* Cleans up showcase & plaque varedits, updated loyalty implant references (#30698)

* Cleans up showcase varedits

* drop_location for oldpods

* Plaques + more loyalty implant references

* Cleans up showcase & plaque varedits, updated loyalty implant references
2017-09-17 23:07:05 -05:00
CitadelStationBotandPoojawa e2e85e9294 [MIRROR] Window Spawner Refactor (#2815)
* Window spawner refactor (#30747)

* Window Spawner Refactor
2017-09-17 22:42:22 -05:00
kevinz000andGitHub c638386507 Syncs maps, and a bunch of other things that no one will care about/notice/give fucks about until they break. Welcome to conflict hell. (#2460)
* fuck pubby

* fuck you too ceres

* ree

* this is going to be a disaster isn't it

* disaster

* dme

* -_-

* tg

* woops

* proper sync

* Welcome to conflict hell.

* lets hope this fixes more things than it breaks

* gdi

* goddamnit
2017-08-24 21:07:58 -07:00
LetterJayandkevinz000 188193eb61 here we go again (#2456) 2017-08-24 19:24:25 -07:00
CitadelStationBotandPoojawa 8a4ddbe8a8 [MIRROR] Ports Rapid Cable Layers from /vg/ and paradise (#2162)
* Ports Rapid Cable Layers from /vg/ and paradise

* rej clean up + manual sync

* maps and .rej file cleanup

* sprite and WGW memes

* actual spellchecked memes

* some other map fix memes

* fuck it, let's just hard sync maps

* dumb paperwork shit for maps

* Revert "dumb paperwork shit for maps"

This reverts commit 8e70bbec0f407c334cd81f5b92aafdb90544ca9d.

* *autistic screeching*

* REEEEEEEEEEEEEEEEEEEEE

* Fuck off I want to do something else
2017-08-02 04:56:44 -05:00
CitadelStationBotandPoojawa 76f7fcef9a [MIRROR] Cleaned up paper varedits + tidied up paths (#2156)
* Cleaned up paper varedits + tidied up paths

* work smarter, not harder

* citadel snowflake

* Update uplink_item_cit.dm
2017-08-02 03:17:32 -05:00
LetterJayandGitHub 6fb37022f5 Merge pull request #2189 from Raeschen/Raes_reducemobs
Reduces amount of mobs on oldstation.dmm
2017-07-30 23:12:49 -05:00
Raeschen 4032f5de36 Used map merging tool 2017-07-30 17:13:39 +01:00
Raeschen e5749b08f7 Merge branch 'Raes_reducemobs' of https://github.com/Raeschen/Citadel-Station-13 into Raes_reducemobs
# Conflicts:
#	_maps/RandomRuins/SpaceRuins/oldstation.dmm
2017-07-30 17:10:38 +01:00
Raeschen 824e4287f2 Heavily reduced the amount of mobs on oldstation.dmm due to NPC POOL MC lag. (Previously about 109 hivebots, now there are fewer, stronger ones.)
Edit: Actually used map merge this time.
2017-07-30 17:05:39 +01:00
Raeschen a6662da11d Heavily reduced the amount of mobs on oldstation.dmm due to NPC POOL MC lag. (Previously about 109 hivebots, now there are fewer, stronger ones.) 2017-07-30 14:03:01 +01:00
CitadelStationBotandkevinz000 49ee9d6cc9 roundstart AT cleanup (#2103) 2017-07-24 04:07:02 -07:00
PoojawaandGitHub b1b4826c0c July 5th TG sync (#1883)
July 5th TG sync
2017-07-05 22:14:19 -05:00
LetterJayandGitHub 10909c9dee Update oldstation.dmm 2017-06-27 12:21:49 -05:00
CitadelStationBot d4c54bb0b5 Ancient Space Station [Space Spawn Ruin] 2017-06-25 11:03:27 -05:00