Commit Graph

187 Commits

Author SHA1 Message Date
deathride58
4abdaa142f Makes the holodeck control room on boxstation compliant with space OSHA 2019-02-28 22:00:35 -05:00
Tupinambis
4d644153d2 Adds Cryobeds to perma 2018-10-19 20:12:51 -05:00
nik707
dcd5141d9b fixes various map bugs PASS1 2018-10-08 12:54:56 -05: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
8a71a710dd One more, for the people in the back now y'all 2018-09-11 12:30:27 -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
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
6e087876e5 makes atmos more secure (#7513) 2018-08-31 12:41:37 -07:00
deathride58
c285261134 Merge pull request #7484 from nik707/boxchanges
changes maint areas near sec
2018-08-23 03:41:29 -04:00
Tupinambis
a1bd981c7c Improves toxins by unbolting toxin chamber doors, and leaving the toxins air alarm unlocked at round start. Move pipes to a less obstructive location. Adds bomb hardsuit to box. (#7473) 2018-08-23 00:26:05 -07:00
nik707
f76127ffc2 changes maint areas near sec 2018-08-21 03:21:59 -05:00
Letter N
958249ba03 boxboxbox 2018-07-07 22:00:46 +08:00
deathride58
db2a15d42d maps, tools, goon folder, icons, sounds, and strings. everything except code 2018-07-01 23:54:31 -04:00
Cw 3040
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
Cw3040
fd1a93907f Box Fix
Accidentally deleted a disposals pipe in Maint, this rectifies that.
2018-06-08 20:21:10 -04:00
Cw3040
d5e3001261 Changes
This should fix Travis's issue.
2018-06-07 21:14:21 -04:00
Cw3040
fa2cbe7fdc BoxStation Changes
-Maintbar
-Added Cryosleepers
-Added KinkMate in Locker Room
2018-06-07 20:43:22 -04:00
LetterJay
5997b69de1 Merge pull request #6995 from Citadel-Station-13/upstream-merge-38240
[MIRROR] Replaces airlock_controller/incinerator related varedits with defines/subtypes
2018-06-05 12:11:34 -05:00
LetterJay
b94207ed11 Merge pull request #6994 from Citadel-Station-13/upstream-merge-38223
[MIRROR] Slight changes to camera network code
2018-06-05 12:11:19 -05:00
81Denton
0d42b1c4d1 Replaces airlock_controller/incinerator related varedits with defines/subtypes 2018-06-03 11:03:14 -05:00
Jalleo
d3f34517dc Slight changes to camera network code 2018-06-03 09:04:24 -05:00
theo2003
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
deathride58
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
cyclowns
f37865ee6c Buffs atmospheric analyzers to show mole count, volume and higher degrees of precision (#37631)
add: Analyzers can now scan all kinds of atmospheric machinery - unary, binary, ternary, quaternary, you name it. This means stuff like gas pumps, gas mixers, vents and so forth can be analyzed.

tweak: Analyzers now show temperature in kelvin as well as celsius.

tweak: Analyzers now show total mole count, volume, and mole count of all gases.

tweak: Analyzers show everything at slightly higher degrees of precision.


More accurate and advanced analyzers have been something that I think atmos and toxins mains have been wanting for a while now (including myself). It's always a pain to have to manually add 273.15 to every celsius temperature, or have to use outside tools or VV (which isnt usable in actual games) to calculate mole count for a gas mixture. Not to mention, the ability to analyze things like volume pumps and gas filters makes it easier to manage larger atmos setups. This is just a QoL change for people in any of those jobs. In fact, most players probably don't even know what the fuck is a mole is so adding mole readout to analyzers is a good way to get people to understand atmospherics better.
2018-05-22 22:11:23 -05:00
81Denton
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 Brown
3b03fa3a37 Replaces loose tech storage boards with spawners 2018-05-14 15:18:17 -05:00
pigeons
2702788dac Removes stock market 2018-05-02 17:48:55 -05:00
YakumoChen
8bb3a4ec75 Readds BZ Cannisters for Xenobiology (#37481)
* update BoxStation.dmm

Adds BZ to Xeno

* Update DeltaStation2.dmm

adds BZ to Xeno

* Update MetaStation.dmm

Updates Meta's Xeno with BZ

* Update PubbyStation.dmm

Adds BZ to Pubby's Xeno
2018-04-30 01:12:22 -05:00
kevinz000
3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
Poojawa
45b1869666 fixes some rushed mapping issues. 2018-04-23 20:47:11 -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
Poojawa
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
CitadelStationBot
1d6d8b454c [MIRROR] Defaults auxbase/escape pod/assault pod/elevator port timidity to FALSE (#6017)
* Defaults auxbase/escape pod/assault pod/elevator port timidity to FALSE

* FUCK (#36483)

F A L S E
semicolon be gone
2018-03-19 21:12:46 -05:00
Poojawa
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
CitadelStationBot
b03917057b [MIRROR] Removes the smoke machine from roundstart chemistry (#5881)
* Unmaps the smoke machine (#36260)

* Removes the smoke machine from roundstart chemistry
2018-03-10 07:35:09 -06:00
CitadelStationBot
a999863e5c [MIRROR] Fixes mirror var desync (#5883)
* Fixes mirror var desync (#36251)

* Fixes mirror var desync
2018-03-10 07:17:52 -06:00
deathride58
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
deathride58
aa0dbb5603 Merge pull request #5850 from Citadel-Station-13/upstream-merge-36070
[MIRROR] Beacons are no longer radios
2018-03-09 18:41:05 +00:00
kevinz000
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 Dupont
72e3ffa562 Beacons are no longer radios (#36070)
* Refactors beacons

* Updates maps

* Done

* aaddddasddsafsdf
2018-03-07 14:43:25 -06:00
Poojawa
bbdf396d28 Pissy babies have their consoles back.
Not like they play science anyway.
2018-03-07 00:12:43 -06:00
Poojawa
86b11050b6 Citadel's folder's end (#5828)
* ERP, miscreants, clothing

* github pls

* guns, dogborg, areas, vendor

* finishes moving around the last of the stuffs

* cleaned up shit. italics on subtle messages

vore code to modular_citadel too

* updates codeowners and recompiles tgui

because it's a healthy thing to do

* reee, I had that spawner set byond

* cleans up a bad pipe

does the thing I've been meaning to do for a while now as well.

* bumps up xenobio console requirements

inb4 reee

* snowflake commenting
2018-03-06 17:40:48 -06:00
Poojawa
0afe9eb7c3 All Maps now have Tesla as a primary engine (#5787)
* Converts all stations except Omega to Tesla Engines

* tweaks and meta fixes

* removes an exploit

* add some missing lights
2018-03-06 03:59:11 -06:00
CitadelStationBot
56137e19d7 [MIRROR] Fixes missing wire on boxstation (#5737)
* Merge pull request #36011

Fixes missing wire on boxstation

* Fixes missing wire on boxstation
2018-02-28 19:30:28 -06:00
deathride58
21179c9105 Merge pull request #5631 from Citadel-Station-13/upstream-merge-35733
[MIRROR] [s] Cameranet fixes
2018-02-23 13:21:23 +00:00
CitadelStationBot
af34232b1a [MIRROR] Adds techweb doppler arrays and fixes their name/desc (#5653)
* adds techweb doppler arrays, fixes techweb desc/name (#35846)

* Adds techweb doppler arrays and fixes their name/desc
2018-02-22 01:29:26 -06:00
ShizCalev
d2ba2bf0c1 [s] Cameranet fixes (#35733) 2018-02-21 07:31:27 -06:00