Commit Graph
145 Commits
Author SHA1 Message Date
Poojawa 184e81eec0 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-16 01:51:51 -05:00
kevinz000andGitHub 7187da9e72 Merge pull request #9456 from Thalpy/Spookytime
[READY] [Spookytime] Adds Jacqueline the Pumpqueen
2019-10-15 23:11:35 -07:00
Ghommie 22fc7a9088 Resprites bedsheet bins in 3/4 perspective, adds towel bins subtype. 2019-10-14 02:32:23 +02:00
FermiandFermi 489e711b4f pls 2019-10-11 18:49:30 +01:00
Poojawa 3113074bfb Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-08 02:55:32 -05:00
Chayse Ramsay 986ac16b93 Adds unrestricted directional access to the medbay lobby and cloning access airlocks on all maps 2019-10-01 22:21:32 +01:00
Poojawa 583cf3d2ed Maps in Blood generators 2019-08-29 23:15:44 -05:00
Poojawa 3499d73f6b Merge remote-tracking branch 'refs/remotes/origin/master' into syntheticbloods 2019-07-31 19:24:39 -05:00
Ghommie 589cdae0e1 Towels 2019-07-18 00:03:49 +02:00
Linzolle 5577014d10 i'm dumb 2019-07-01 02:19:30 -05:00
Linzolle 42a5f4ac9f fixes supply display being on the ground 2019-07-01 01:43:35 -05:00
Poojawa f6f4c946e6 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-05-22 00:08:13 -05:00
Poojawa 2f4e19bb87 Cryopod mapping fixes
Directional pods are also a thing too, neat.
2019-05-16 11:19:49 -05:00
Poojawa 3f6cd92d54 Ok this time all of them are nitpicked 2019-05-09 10:15:51 -05:00
Poojawa 0f02562b51 Fixes Xenomorph blood related travis errors 2019-05-09 09:59:34 -05:00
Tupinambis 18bc815b55 Replaces all missing textures with sandy plating as was intended. 2018-11-28 16:37:02 -06:00
Poojawa c836a7e5ea Cleans up map errors
Knowing my fucking luck it ain't all of 'em
2018-09-20 04:28:02 -05:00
Poojawa 1d5c52ddf8 shit ain't pretty, but whatever cleaned 2018-09-11 12:01:21 -05:00
Poojawa fa70720cc1 Map Conversions 2018-09-11 08:58:34 -05:00
deathride58andGitHub 45d0afb957 Merge pull request #7522 from nik707/armorynerfs
Nerfs the starting armory
2018-09-06 14:19:33 -04:00
deathride58andGitHub 95548530b3 Merge pull request #7526 from Tupinambis/TheSpareV2
Makes Spare more Accessible for heads (V2 because I forgot to compile the first time haha yes)
2018-09-03 13:43:31 -04:00
Tupinambis afcf52f5d8 This time it should actually work. I forgot to compile the first because I am an idiot haha yes. 2018-08-31 18:05:10 -05:00
nik707 8d0b2966b8 changes starting armory loadout 2018-08-31 11:17:08 -05:00
nik707 da638407ab adds toxins to omega 2018-08-27 00:55:53 -05:00
Letter NandGitHub c3bdd0f3bb omegaomegaomega 2018-07-07 22:03:55 +08:00
deathride58 db2a15d42d maps, tools, goon folder, icons, sounds, and strings. everything except code 2018-07-01 23:54:31 -04:00
LetterJayandGitHub 50da00b26c Merge pull request #7161 from Citadel-Station-13/upstream-merge-38540
[MIRROR] Cleans up supermatter related varedits
2018-06-18 21:58:15 -05:00
Cw 3040andkevinz000 27b6ebc612 Cw's Spaceruins, Maintbar and Kegspawn changes (#7141)
* Station Changes

-Added Jukebox to: Box (maintbar), Meta (maintbar), Pubby (maintbar),
and Omega (maintarcade)
-Added keg spawn to Pubby
-Removed Legcuffs and Rifle Stock from Box maintbar (people were unhappy
with the fact these were sprited identically to handcuffs, will re-add
if someone ports Virgo's legcuffs)

* Space Ruins Changes

-Added KinkMates to SpaceHotel
-Swapped riot helmet for AI detecting multitool on TurretedOutpost
-Changed the loot for oldAIsat to not have a suspicious toolbox, instead
having a toolbelt and combat gloves

* Kegspawn Change

Changed Spawn Rate of kegs to:
-50% mead (5 in 10 instead of 5 in 8)
-20% aphro (2 in 10 instead of 1 in 8)
-20% strong aphro (2 in 10 instead of 1 in 8)
-10% pan galactic gargle blaster (1 in 10 instead of 1 in 8)

* Small MetaStation Fixes

Fixed bug reported by Nethaufer (Zig)#5868 on discord, there was a wire
(and an air supply pipe) accidentally deleted.
2018-06-18 11:52:11 -07:00
81Dentonandletterjay 9b1f891a29 Cleans up supermatter related varedits (#38540)
* Cleans up supermatter related varedits

* reee

* fakecrystal
2018-06-18 09:38:16 -05:00
theo2003andletterjay b9ac5c0544 Roboticists now have access to open the R&D windoors. (#38226) 2018-06-03 09:03:42 -05:00
LetterJay 3b498f2288 map fix 2018-06-02 05:41:31 -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
81Dentonandletterjay 5ed28b5cd2 Adds "proper" solar/gold/silver crates (#37890)
* adds solar/gold/silver crates

* replaces pubbystation crates

* hhhh

* forgot adding spaces

* travis pls
2018-05-19 02:14:00 -05:00
Jordan Brownandletterjay 7dc1c116d5 Merge pull request #37818 from AutomaticFrenzy/patch/missing-icons
Fix some missing icons
2018-05-14 15:13:33 -05:00
pigeonsandCitadelStationBot 2702788dac Removes stock market 2018-05-02 17:48:55 -05:00
kevinz000andPoojawa 3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
Poojawa b1d64e221a core maps updated. Lavaland mining base now has cryo 2018-04-23 04:30:03 -05:00
Poojawa 0d5d992732 compile fixes + initial map port 2018-04-23 03:37:10 -05:00
Jordan BrownandCitadelStationBot 492a31d37c Merge pull request #37195 from 81Denton/remove-tinyfan-from-the-premises
Removes tinyfans from omega/delta tcomms
2018-04-15 09:57:25 -05:00
ShizCalevandCitadelStationBot 5dfd1f7d42 grunge airlock 2018-04-13 09:04:55 -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
ArmhulenandCitadelStationBot 2d8b007086 Refactors Spell and Martial Art Books to use Action Granters! 2018-03-28 12:18:06 -05:00
CitadelStationBotandPoojawa bcc360d0d9 [MIRROR] Fixes omega detective office + prepare_maps change (#6110)
* Fixes omega detective office + prepare_maps change (#36691)

* Fixes Omega Detectives office

* Mentions mapmerge isntead of run map merge

* Fixes omega detective office + prepare_maps change
2018-03-26 04:31:41 -05:00
ShizCalevandCitadelStationBot b569465705 Adds lights to the bridge on Omega (#36537) 2018-03-21 01:04:05 -05:00
Tad HardestyandCitadelStationBot 5edfbf5224 Fix mislabelled and stacked OmegaStation cameras (#36460)
* Fix stacked camera in OmegaStation departures

* Move some Omega cameras to the correct network
2018-03-17 07:52:52 -05: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
deathride58andGitHub a62aa577f1 Merge pull request #5854 from Citadel-Station-13/upstream-merge-36055
[MIRROR] Techwebs update: Protolathe/Circuit imprinters combined into techfabs!
2018-03-09 19:25:12 +00: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
Dax DupontandCitadelStationBot 72e3ffa562 Beacons are no longer radios (#36070)
* Refactors beacons

* Updates maps

* Done

* aaddddasddsafsdf
2018-03-07 14:43:25 -06:00
ShizCalevandCitadelStationBot d2ba2bf0c1 [s] Cameranet fixes (#35733) 2018-02-21 07:31:27 -06:00