Commit Graph

210 Commits

Author SHA1 Message Date
kevinz000
076b6c8699 Merge pull request #9077 from Sishen1542/id-boingo
No ID insertion for everything except the hop console
2019-09-10 22:04:48 -07:00
EmeraldSundisk
68315657f5 Who left those earmuffs out anyway? 2019-08-28 11:15:45 -07:00
Sishen
f59b60e83a QOL OOGA BOOGA 2019-08-08 01:11:20 -04:00
Chaz
6eb887bb17 I really hope this works this time. 2019-08-07 17:01:55 -07:00
TrilbySpaceClone
54f3934f55 step to pixel 2019-07-29 12:50:13 -04:00
TrilbySpaceClone
d610d9e4eb green man told me to 2019-07-29 12:16:58 -04:00
Ghommie
589cdae0e1 Towels 2019-07-18 00:03:49 +02:00
deathride58
d218739bf8 Merge pull request #8740 from Ghommie/Ghommie-cit87
ports "More variety for dorms bedsheets" + 3 new bed sheets.
2019-07-08 18:06:11 -04:00
kevinz000
a9738e0790 Merge pull request #8819 from Sishen1542/publiclathe
All maps in rotation now have a public autolathe.
2019-07-07 02:44:32 -07:00
Sishen
e76954455c fixed lathes 2019-07-03 17:21:05 -04:00
Linzolle
52a6201f41 oops 2019-07-01 02:24:12 -05: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
Sishen
97241cd1e8 jetpacks, take 2 2019-06-29 00:29:49 -04:00
Sishen
8cd14ea48a Update BoxStation.dmm 2019-06-26 15:06:38 -04:00
Sishen
e3af8a1a6b Update BoxStation.dmm 2019-06-26 14:50:48 -04:00
Ghommie
9f0278c34f map merging. 2019-06-24 06:13:42 +02:00
Ghommie
fd68236594 ports "More variety for dorms bedsheets" + 3 new bed sheets. 2019-06-24 05:54:14 +02:00
Sishen
21c678736b crewmonitor 2019-05-27 22:46:28 -04:00
kevinz000
4be6b352e0 Merge pull request #8423 from Sishen1542/EngiShower3
Engineering Showers! (Fixed 4 REALZIES this time)
2019-05-27 03:31:16 -07:00
Sishen
92bbe42337 FOUR TRIES? IT TOOK HIM FOUR TRIES?! 2019-05-24 07:41:18 -04:00
Poojawa
ab2457d504 Large Maps given an Apothecary 2019-05-21 06:09:10 -05:00
Poojawa
2f4e19bb87 Cryopod mapping fixes
Directional pods are also a thing too, neat.
2019-05-16 11:19:49 -05:00
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