Commit Graph
28790 Commits
Author SHA1 Message Date
GinjaNinja32 57a795cb8a Merge pull request #11890 from PsiOmegaDelta/160103-WeirdGlass
Replaces mega-health windows.
2016-01-04 01:58:17 +00:00
PsiOmegaDelta 6aea83aeb3 Replaces mega-health windows.
Mega health windows (the old 1e007 Crescent windows) are now replaced with with either normal reinforced windows or the Crescent window sub-type or relevant window spawners.
Also changes the security sub-armory window from dir 5 to 2 (non-cardinal directions transforms windows into full-tile ones, it's no longer visible in the mapper). Fixes  #11889.
Adds pre-defined full tile reinforced windows for when those are needed.
2016-01-03 20:57:34 +01:00
GinjaNinja32 c1762c6b22 Merge pull request #11886 from PsiOmegaDelta/160103-TheMap
More fixes.
2016-01-03 12:59:02 +00:00
GinjaNinja32 14c59977f6 Merge pull request #11887 from Ccomp5950/fix_dionae_organs
Fixes #11885
2016-01-03 12:30:46 +00:00
ccomp5950 16ca56e197 Fixes #11885 2016-01-03 07:09:59 -05:00
PsiOmegaDelta b22d7c58bb Makes it possible to connect to cable nodes on shuttle plating.
Fixes #11852.
2016-01-03 12:49:27 +01:00
PsiOmegaDelta d02e19bd5f Actually adds the pre-chilled nitrogen canisters. 2016-01-03 12:30:23 +01:00
Ccomp5950 b16c5ae131 Merge pull request #11876 from PsiOmegaDelta/160102-Chill
Adds a chilled N2 canister to Research Server room.
2016-01-02 20:33:23 -05:00
PsiOmegaDelta a2a5e367f6 Adds a chilled N2 canister to Research Server room.
With minor cleanup included. Fixes #11790.
2016-01-02 19:15:59 +01:00
GinjaNinja32 cabdc24d10 Merge pull request #11869 from PsiOmegaDelta/161201-MapFixes
Fixes random floor plating in the primary tool storage and HoP's office.
2016-01-02 17:37:26 +00:00
Ccomp5950 7dc9b3487a Merge pull request #11739 from PsiOmegaDelta/151214-ObserveThis
Qdel() tweaking and a bonus
2016-01-01 23:58:29 -05:00
PsiOmegaDelta bd083ca164 Fixes random floor plating in the primary tool storage and HoP's office. 2016-01-01 23:33:13 +01:00
PsiOmegaDelta ebdd394e4f Merge pull request #11868 from hockeygoalie5/fixes
Fixes
2016-01-01 23:29:45 +01:00
Chinsky e947862886 Merge pull request #11851 from atlantiscze/31-12-2015-consolepresets
Modular Consoles, Tweaks
2016-01-02 01:25:50 +03:00
Mustafa Kalash 7d67efa381 Finishes 6e23584. 2016-01-01 17:17:33 -05:00
Mustafa Kalash de6779c6a8 Continuation of 6e23584. 2016-01-01 16:32:59 -05:00
Mustafa Kalash 73436d6cfd Fixes another problem with be75349. Should be for real this time. 2016-01-01 16:31:04 -05:00
Mustafa Kalash 6e23584e69 Fixes #11776. Fixes error in be75349. 2016-01-01 16:20:02 -05:00
Mustafa Kalash 82e793ae91 Fixes #11783 2016-01-01 15:52:35 -05:00
Mustafa Kalash be753497d0 Fixes #11801. 2016-01-01 15:35:17 -05:00
Mustafa Kalash 9a2245fe65 Fixes #11864 2016-01-01 15:05:22 -05:00
Chinsky 03a4ef022e Merge pull request #11849 from PsiOmegaDelta/151231-Atmotop
Fixes atmospherics laptops proper.
2016-01-01 21:11:45 +03:00
Chinsky 290cae2b51 Merge pull request #11854 from Loganbacca/devfix
Small fixes
2016-01-01 21:11:04 +03:00
PsiOmegaDelta e76278fe5c Merge pull request #11862 from PsiOmegaDelta/dev
Dev
2016-01-01 13:24:55 +01:00
PsiOmegaDelta ef82e503f2 Updates Travis' macro count. 2016-01-01 13:20:25 +01:00
PsiOmegaDelta d6ccd49489 Updates changelog. 2016-01-01 13:16:16 +01:00
PsiOmegaDelta 253a4bc3d0 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2016-01-01 13:15:51 +01:00
PsiOmegaDelta 4ed1e118fc Merge pull request #11861 from Baystation12/master
Dev-freeze
2016-01-01 13:14:21 +01:00
PsiOmegaDelta 821bdfbb81 Merge pull request #11858 from hockeygoalie5/rescuerig
Moves the rescue rig to the paramedic area and makes it the equipped type.
2016-01-01 13:11:35 +01:00
PsiOmegaDelta 0f44645a75 Merge pull request #11856 from atlantiscze/01-01-2015-GasAxing
Removes oxygen_agent_b and volatile_fuel gases
2016-01-01 12:18:18 +01:00
PsiOmegaDelta e6923872e9 Merge pull request #11857 from atlantiscze/01-01-2016-CartridgesFix
Fixes chemical cartridge splashing
2016-01-01 12:18:01 +01:00
Mustafa Kalash 6ebc953d86 Makes the rescue rig the equipped type and moves it to the paramedic area. 2015-12-31 20:08:44 -05:00
Atlantis 9d1e6e017c Fixes chemical cartridge splashing
- Fixes #11853
- Attempting to transfer reagents into the cartridge when it is closed will no longer splash the reagents.
2016-01-01 01:43:53 +01:00
Atlantis 0d10e4b1ef Removes oxygen_agent_b and volatile_fuel gases
- oxygen_agent_b wasn't used at all, except for filters which, for some reason filtered it in addition to phoron
- volatile_fuel was only used in two chemistry reactions as reaction result, it was replaced with gaseous phoron.
2016-01-01 00:34:59 +01:00
Loganbacca 4fdfc84249 Fixed projectile effect runtime
Only showing the impact effect without the rest of the tracer would look a
bit silly anyway.
2016-01-01 11:28:02 +13:00
Loganbacca 77bce347c1 Added hardhat action button 2016-01-01 11:15:34 +13:00
PsiOmegaDelta f99be6ac3d Merge pull request #11847 from headswe/whitelist_fix
Alien Whitelist SQL version
2015-12-31 22:56:14 +01:00
Atlantis 6f07a17dc8 Makes it possible to turn the NanoPrinter off in configuration program 2015-12-31 21:29:58 +01:00
Atlantis 2d6072004a Maps in modular computers
- Maps in bunch of modular consoles, mostly replacing old consoles with them. I've replaced them with relevant department presets.
- Engineering control room merged with Atmospherics control room, under single area.
- Fixes possible qdel() issue with console's/laptop's processor object.
- Removes Karolis's console preset, as it is now part of Command console preset under different typepath.
2015-12-31 20:19:13 +01:00
Atlantis b520dc0266 Adds presets, loadout items, bugfix
- Fixes a runtime error when an ID Card slot is Destroy()-ed
- Adds few presets for consoles, such as, engineering console, command console, etc.
- Adds tablet and cheap tablet as loadout preferences with cost of 4 and 3 points respectively. Cheap tablet contains only worst battery, hard drive and network card, regular tablet has average components.
2015-12-31 19:14:28 +01:00
Karolis2011 faf82347d6 Few fixes.
Modular consoles now will look more like old ones.
Added 'id' screen overlay for tablets.
Added new Cargo department assigments to ID modification program.
2015-12-31 18:06:10 +02:00
PsiOmegaDelta bbb84e02b9 Fixes atmospherics laptops proper.
Adds a new laptop overlay that fits the atmospherics computer.
2015-12-31 12:42:18 +01:00
Karolis2011 485963e6c7 Replaced old card console paths with new ones. 2015-12-31 13:23:30 +02:00
Karolis2011 3076884f6e Adds new modular ID modification console and
removes old console. This commit won't compile.
2015-12-31 13:17:31 +02:00
Karolis2011 4b5d5ebe64 New Card modification program
also breaks old console (makes it only manifest console)
and adds title option to nano printer
2015-12-31 13:12:43 +02:00
PsiOmegaDelta 9a7f6c7b65 Merge pull request #11827 from atlantiscze/30-12-2015-teslafix
Computer fixes and tweaks
2015-12-31 11:49:42 +01:00
Sebastian Broberg 10640b172d Alien Whitelist SQL version 2015-12-31 10:56:04 +01:00
Chinsky 90301c67c1 Merge pull request #11794 from Kearel/qolmystuff
Microwave/Board game QoL stuff
2015-12-31 01:03:58 +03:00
Chinsky 7ad106349c Merge pull request #11749 from headswe/soulstone_fix
Fixes #11711 & Refractors soulstone.dm
2015-12-31 00:36:14 +03:00
GinjaNinja32 6a03bc9542 Merge pull request #11838 from PsiOmegaDelta/151230-DevMap
Map tweaks.
2015-12-30 20:20:04 +00:00