Commit Graph

21866 Commits

Author SHA1 Message Date
PsiOmegaDelta
983109faf4 Removes legacy computer code. 2016-01-02 13:44:08 +01:00
Zuhayr
5ec489aef5 Added a colour selector to the floor painter, added the floor painter to the construction and drone modules.
Conflicts:
	code/modules/mob/living/silicon/robot/robot_modules.dm
2016-01-02 12:23:30 +01:00
Loganbacca
979a120411 Helmet overlay runtime fix 2016-01-02 12:17:28 +01:00
ccomp5950
eab39185e2 Change to _template. 2016-01-02 01:45:40 -05:00
Ccomp5950
7dc9b3487a Merge pull request #11739 from PsiOmegaDelta/151214-ObserveThis
Qdel() tweaking and a bonus
2016-01-01 23:58:29 -05:00
ccomp5950
47af67b72f Terminal Colors Green and Red for success states. 2016-01-01 20:33:01 -05: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
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
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
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
Kearel
2a44128b78 Modifications to actor verb, orion trail, and board game.
Orion Trail only works when power is on now.
'Join as Actor' verb will now prompt you to make sure.
Boardgame can now be picked up by those viewing it (makes it easier to
view)
2015-12-31 17:54:25 -06: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
ccomp5950
4d24790c2e Unit Tests now sets some config options if they aren't already set. 2015-12-31 13:08:05 -05:00
ccomp5950
9d9eee35ef Made failed unit tests a little more noticeable. 2015-12-31 11:18:17 -05:00
ccomp5950
e084244a6a Vacuum not Vacume. 2015-12-31 11:18:16 -05:00
ccomp5950
218c84064b Updated ZAS unit test to be more re-useable.
Went nuts adding some.  This will fail travis due to some existing bugs.
2015-12-31 11:18:16 -05:00
ccomp5950
c159656dab Removed text2path.
Kudos PsiOmegaDelta
2015-12-31 11:18:16 -05:00
ccomp5950
997a6c66fd Adds Supply Shuttle Unit Tests.
Moves the Supply Shuttle and tests air in both locations.

turned the air test into a "helper" proc.

Changed the world.dm message when unit testing is enabled so folks aren't caught off guard when the server shutsdown after testing.
2015-12-31 11:18:16 -05:00
ccomp5950
94eb03c591 Unit Test: Escape Shuttle ZAS check. + Templates 2015-12-31 11:18:16 -05:00
ccomp5950
6633fb4e08 Unit Tests
Adds an example, edits Travis to run them.
2015-12-31 11:18:15 -05: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
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
Ccomp5950
0069dc653c Merge pull request #11835 from GinjaNinja32/11828
fix #11828
2015-12-30 15:18:45 -05:00
Ccomp5950
8c8e1ae348 Merge pull request #11836 from PsiOmegaDelta/151230-GlowyStuff
Door related glow.
2015-12-30 15:18:13 -05:00
PsiOmegaDelta
6ff99e2bd7 Door bolt lights and alarming emergency shutters now glow. 2015-12-30 20:32:14 +01:00
GinjaNinja32
a56597a3c5 Merge pull request #11823 from PsiOmegaDelta/151230-MapTweaks
Fixes.
2015-12-30 18:48:44 +00:00