3b498f2288
map fix
2018-06-02 05:41:31 -05:00
9c4f4ce17f
AI Multicamera mode ( #37695 )
...
* Added multicamera mode for AIs
* Minor multicamera fixes
* Cameras near an AI multicamera eye now light up red
* Disabled AI multicamera mode without admin intervention
* Fixed AIs being able to use multicamera mode when they should not
2018-05-31 22:41:48 -05:00
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
1ce820d2ed
[MIRROR] Adds action features to the metastation beerkeg-nukes ( #6925 )
...
* Adds action features to the metastation beerkeg-nukes (#38084 )
* Hottomonkulu Pyynö mos kyren hepität. Nerse marentaat aluturnate.
* Masennoo sum keuron väkeltäät vassem Pyynö er borsalitaat Urmas.
* Tarnatat kuulor ustanitat vernes heuremasso seurutik Pyynör kanervo mahkatosimos. Atti ivakhan nutiv.
* Surmustulet nasnas kyhille nes viuhuntut sepelitör arnisansatin.
* Adds action features to the metastation beerkeg-nukes
* Test 1
* Test 2
* Test 3
2018-05-27 19:32:09 -07:00
69af2087aa
Merge pull request #6848 from Citadel-Station-13/upstream-merge-37631
...
[MIRROR] Buffs atmospheric analyzers to show mole count, volume and higher degrees of precision
2018-05-27 01:32:02 -05:00
e0c31c2b3a
Merge pull request #37984 from AutomaticFrenzy/patch/thunderdome
...
Fix entertainment monitors viewing the wrong Thunderdome
2018-05-23 05:15:46 -05:00
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
86f69e2947
Merge pull request #6796 from Citadel-Station-13/upstream-merge-37890
...
[MIRROR] [Ready] Adds "proper" solar/gold/silver crates
2018-05-19 09:13:58 -05:00
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
21b9f72e49
Deltastation edits/fixes ( #37876 )
...
Readds a missing solar panel to port-bow solars.
Replaces an access locked kitchen fridge in arrivals maintenance with its no-access variant.
Readds missing decal warning lines.
2018-05-17 21:16:02 -05:00
bb1fe6cba2
Merge pull request #6660 from GrayRachnid/add-dorms-to-ninja-capture
...
Add dorms to ninja capture
2018-05-15 20:53:05 +00:00
ce98f9c444
Merge pull request #6746 from Citadel-Station-13/upstream-merge-37785
...
[MIRROR] Replaces loose tech storage boards with spawners
2018-05-15 06:53:25 -05:00
f86af0ab41
Merge pull request #6743 from Citadel-Station-13/upstream-merge-37818
...
[MIRROR] Fix some missing icons
2018-05-15 06:52:32 -05:00
3b03fa3a37
Replaces loose tech storage boards with spawners
2018-05-14 15:18:17 -05:00
7dc1c116d5
Merge pull request #37818 from AutomaticFrenzy/patch/missing-icons
...
Fix some missing icons
2018-05-14 15:13:33 -05:00
5a76b56d04
Merge pull request #37743 from AutomaticFrenzy/patch/meta-pipe
...
Remove a duplicate pipe in MetaStation maint
2018-05-14 11:01:08 -05:00
8463204549
Runtime: fixes RTG power, adjusts pipenet, adds debug chem dispensers
2018-05-12 18:53:59 -05:00
a7196f0d4c
Unlocks the booze locker
2018-05-07 12:29:36 -04:00
e22259a77d
mapmerger
2018-05-06 16:37:44 -04:00
41ce1b1e5b
Now ready for all your ERP needs.
2018-05-06 16:20:49 -04:00
f387bb1694
Merge pull request #6633 from Citadel-Station-13/upstream-merge-37622
...
[MIRROR] Changes cockroach guts to insect guts
2018-05-05 09:40:11 -05:00
5fae4a6c90
Merge pull request #37649 from 81Denton/watch-me-mash-my-keyboard-fwgiupghebipuernbvepw9vb85344355v
...
Fixes runtimestation RnD machinery, adds circ printer+analyzer
2018-05-04 11:17:40 -05:00
deddd8debe
Merge pull request #37622 from ShizCalev/cockarock
...
Changes cockroach guts to insect guts
2018-05-03 08:42:46 -05:00
2702788dac
Removes stock market
2018-05-02 17:48:55 -05:00
8dd48870c1
Merge pull request #37570 from BuffEngineering/WestSolars
...
Fixes mapping issue on deltastation
2018-04-30 21:20:34 -05:00
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
3369c804b2
Kills off /obj/item/device ( #6561 )
2018-04-30 00:06:58 -05:00
2ee4d3e77d
Merge pull request #6515 from Citadel-Station-13/upstream-merge-37326
...
[MIRROR] Removes SCP_294
2018-04-27 09:35:43 +00:00
17aa0acef8
Removes SCP_294 ( #37326 )
...
* aaah sweet essence
* bye bye sprites
* goodbye machine code
* bye bye blacklist entry
* whoops
* scp gone from runtime
* bye bye ract
* bye bye space ruin folder
* bye bye area
2018-04-25 10:05:57 -05:00
45b1869666
fixes some rushed mapping issues.
2018-04-23 20:47:11 -05:00
b1d64e221a
core maps updated. Lavaland mining base now has cryo
2018-04-23 04:30:03 -05:00
0d5d992732
compile fixes + initial map port
2018-04-23 03:37:10 -05:00
3bcfd0dfb6
Delta ORM position ( #37325 )
...
* makes delta ORM accessible
* turf decal
2018-04-22 19:21:04 -05:00
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
5d5dc5483e
Merge pull request #6399 from Citadel-Station-13/upstream-merge-37158
...
[MIRROR] Cleans up CENTCOM morgue/chapel/library doors
2018-04-14 07:42:57 -05:00
5dfd1f7d42
grunge airlock
2018-04-13 09:04:55 -05:00
d139c8ebb3
Updates baseturf helpers to the new baseturf system ( #37154 )
2018-04-13 07:58:37 -05:00
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
f7be23e78a
Merge branch 'master' into upstream-merge-36442
2018-04-01 19:50:37 -05:00
b58c0a8157
Merge pull request #36850 from 81Denton/pubby-bombsite-cams
...
Pubby: fixes bomb testing site cam networks
2018-04-01 07:26:31 -05:00
2d8b007086
Refactors Spell and Martial Art Books to use Action Granters!
2018-03-28 12:18:06 -05:00
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
b569465705
Adds lights to the bridge on Omega ( #36537 )
2018-03-21 01:04:05 -05:00
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
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
74eddfd888
Fixes broken engineering in Pubby
2018-03-15 20:45:50 -05:00
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
7b9dac0a47
Makes the titlescreen properly positioned for widescreen again ( #5874 )
...
* Makes the titlescreen properly positioned for widescreen again
* Appeases Pooj, requests knot
2018-03-13 18:38:49 -05:00
41612ee1f6
[MIRROR] Fixes Delta atmos maint access ( #5897 )
...
* Fixes Delta atmos maint access (#36291 )
* Fixes Delta atmos maint access
2018-03-10 23:08:41 -06:00
21bd33233b
[MIRROR] Delta: Adds wall safes to HoP/Cap offices ( #5895 )
...
* Delta: Adds wall safes to HoP/Cap offices (#36281 )
* fixes atmos emergency exit area, adds wall safes
* reverts atmos maint area
* Delta: Adds wall safes to HoP/Cap offices
2018-03-10 23:08:15 -06:00
LetterJay