Zuhayr
ff556316a8
Merge pull request #5679 from mwerezak/wound-infections
...
Removes organ_failure random event
2014-07-19 12:32:50 +09:30
Mark Aherne
3323a26300
Added PDA check in wear_id slot to get any potential id rank.
2014-07-19 03:38:50 +01:00
Mark Aherne
8396b76b83
Improved Crew Monitoring Console map.
...
Added icons for use with map.
2014-07-19 02:44:13 +01:00
PsiOmega
73f8c30111
The AI may now store and return to a single position for its eye/camera view.
2014-07-19 02:58:16 +02:00
Mark Aherne
390fb696da
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
2014-07-19 00:32:14 +01:00
Mark Aherne
f09b24ae17
Added a station map to NanoUI, this map can be used by any NanoUI to display live/dynamic elements on a map.
...
The map functionality has been added to the crew monitor console to show active crew trackers, this is working but needs refinement (icons etc.).
2014-07-19 00:31:28 +01:00
Mloc-Hibernia
ccc73ddf69
modularize ban system
...
Signed-off-by: Mloc-Hibernia <colmohici@gmail.com >
2014-07-18 21:08:01 +00:00
Chinsky
f83b9b4eed
Merge pull request #5681 from mwerezak/looc
...
Fixes #5666
2014-07-19 00:33:08 +04:00
mwerezak
b3a99cefcf
Fixes #5666
2014-07-18 16:16:43 -04:00
mwerezak
ad211b19f7
Tweaks shotgun beanbag rounds
...
Makes them more comparable to the shotgun stunshot.
2014-07-18 16:03:54 -04:00
mwerezak
c46904a3b6
Merge remote-tracking branch 'upstream/dev' into power-net
...
Conflicts:
code/ATMOSPHERICS/components/binary_devices/pump.dm
code/ATMOSPHERICS/components/binary_devices/volume_pump.dm
code/ATMOSPHERICS/components/unary/vent_pump.dm
code/ATMOSPHERICS/pipes.dm
2014-07-18 15:02:07 -04:00
mwerezak
9825968880
Fixes lingering reference to organ_failure
2014-07-18 12:02:39 -04:00
mwerezak
9b71eb1fe6
Removes organ_failure random event
2014-07-18 11:40:49 -04:00
Loganbacca
c4abe1f5d5
Pipe cleanup
...
- Tidied up a couple of remaining pipes
- Removed overlapping pipes
- Removed step_x, step_y vars
2014-07-18 13:43:08 +00:00
Loganbacca
fb6c928c4d
Atmos update tweaks
...
- Updated pump and volume pump icons
- Reverted air scrubber icon
- Fixed passive gate icon
- Updated pipe_item sprites
- Fixed an oversight in the pipe color check
- Cleaned up the map
2014-07-18 13:41:59 +00:00
Loganbacca
e05b5c0bfb
Pipe rendering rewrite
...
- Complete rewrite of pipe rendering code. It now selects icons from a shared cache.
- Manifolds and other devices (pumps, filters, etc.) now match the color of the connected pipes.
- Updated omni devices to use the shared cache.
- Set separate pipe color definitions.
- Cleaned up a lot of pipe code, converting it to absolute paths and removing old commented out code.
- Tweaked t-ray rendering code.
- Tweaked pipe painter.
- Enhanced pipe checking debug command.
- Expanded tank capacity and resprited them.
2014-07-18 13:39:39 +00:00
Mloc-Hibernia
51d2451c01
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Signed-off-by: Mloc-Hibernia <colmohici@gmail.com >
Conflicts:
nano/templates/geoscanner.tmpl
2014-07-18 13:15:30 +00:00
Mloc-Hibernia
281a26b979
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Signed-off-by: Mloc-Hibernia <colmohici@gmail.com >
Conflicts:
code/modules/mob/living/silicon/robot/robot_modules.dm
2014-07-18 13:08:12 +00:00
Mloc
ae9d75bd5e
Merge pull request #5664 from Zuhayr/pais
...
Mobile pAIs.
2014-07-18 14:07:11 +01:00
Zuhayr
8e66bfe236
Moving lists from prior commit to a better place.
2014-07-18 22:29:07 +09:30
Zuhayr
ac62b0ec5c
Moved pAI lists to globals.
2014-07-18 22:24:51 +09:30
Mloc
01c5025af6
Merge pull request #5672 from mwerezak/docking
...
Docking controllers updates
2014-07-18 12:58:11 +01:00
Mloc
6efff01110
Merge pull request #5671 from mwerezak/silicon-lang
...
Removes Rootspeak from AI and robot languages
2014-07-18 12:55:49 +01:00
Zuhayr
aad7db43ad
Added a monkey sprite for pAIs.
2014-07-18 19:46:51 +09:30
Atlantiscze
95a45a646f
Fixes #5572
...
- Detective-vended laptops now have medical records program installed.
2014-07-18 12:14:33 +02:00
Zuhayr
33bff18290
Removed a bit of redundant code, added pull check for mpAIs.
2014-07-18 19:15:48 +09:30
Zuhayr
9401dcf13c
Fixes bug with drone Bump() check
...
They can now use teleporters, hand tele portals and the disposals chute.
2014-07-18 19:13:24 +09:30
mwerezak
7361c7da45
Loosens the undocking requirements for airlocks
2014-07-17 22:03:05 -04:00
mwerezak
3ea7e0ce3c
Adds a name for the escape pod controller
2014-07-17 20:07:13 -04:00
mwerezak
21b2742086
Adds default values for some docking tags
...
Simplifies the mapping of docking controllers by cutting down on the
number of tags needed to be entered.
2014-07-17 20:01:20 -04:00
mwerezak
3209cb49a6
Removes Rootspeak from AI and robot languages
2014-07-17 19:30:00 -04:00
Atlantiscze
1e512fdde2
Fixes #5569 , Fixes #5571
...
- Reworked card reader code, it's cleaner and less copypaste now
- Updated medical records, security records and HoP card computer to work with the update. It's however possible i missed something, can't go through all computers in game. Tell me if you find something that's broken due to this, i will fix it ASAP.
- Security records color for "none" security status changed a bit so it doesn't burn eyes of anyone trying to read it (issue #5571 - white on light green? Bad choice imo)
- Multi-card readers now actually WORK for laptops. This includes security records (issue #5569 ) and medical records (same case, just not reported). You still have to insert your card into read slot, if you insert it into wrong slot notification will be shown that you should use read slot instead of write one.
2014-07-18 00:47:39 +02:00
Atlantiscze
4096b26c8d
Fixes #5553
...
Camera network key itself is useless without security camera program. Created hidden version of this program and added it to each laptop. In short: it works.
2014-07-17 19:03:31 +02:00
Atlantiscze
72dbce88ce
Fixes #5570
...
Also de-copypasted charger code, as i had the opportunity.
2014-07-17 18:01:19 +02:00
Zuhayr
3b20df66e5
Merge pull request #5622 from Faerdan/dev
...
Layout update for NanoUI.
2014-07-17 23:58:32 +09:30
Zuhayr
73d3883da3
Merge pull request #5652 from comma/master
...
Couple xenoarch fixes
2014-07-17 23:56:18 +09:30
Zuhayr
1f332bb1b0
Merge pull request #5654 from PsiOmegaDelta/StateLaws
...
Allows the AI to select which channel to state laws on
2014-07-17 23:56:07 +09:30
Zuhayr
63da854471
Merge pull request #5659 from mwerezak/op-hideout
...
Maps the new op hideout into an asteroid base
2014-07-17 23:56:00 +09:30
Zuhayr
55021687d2
Merge pull request #5661 from PsiOmegaDelta/Soap
...
Deluxe soap now has a more pleasant range of smells.
2014-07-17 23:55:51 +09:30
Zuhayr
3999c0bfb5
Fixed runtime with host bioscan, added verb cooldowns.
2014-07-17 23:31:12 +09:30
Zuhayr
1345ee5a5c
Initial commit for mobile pAIs. Almost guaranteed to be broken as shit.
2014-07-17 23:09:47 +09:30
Mark Aherne
26e0c64801
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
2014-07-17 13:48:52 +01:00
Chinsky
9e0569cfb9
Merge pull request #5631 from PsiOmegaDelta/Engine
...
Remote-controlled emitters
2014-07-17 15:42:03 +04:00
Chinsky
248affdebe
Merge pull request #5656 from mwerezak/wound-infections
...
Infection system tweaks
2014-07-17 15:39:16 +04:00
Chinsky
e2e944dc66
Merge pull request #5655 from Walter0o/patch-2
...
should fix #5618 , trivial kitchen utensil bug
2014-07-17 15:38:42 +04:00
Chinsky
543ab8acc3
Merge pull request #5653 from atlantiscze/tcomms-fix
...
TComms heat fix + repairing
2014-07-17 15:37:52 +04:00
Zuhayr
ea8cdb52c7
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
2014-07-17 20:59:45 +09:30
Zuhayr
3976433396
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev
2014-07-17 20:57:06 +09:30
PsiOmega
d2cdf01a60
Deluxe soap now has a more pleasant range of smells.
2014-07-17 12:54:51 +02:00
PsiOmega
dfcf25ce49
Allows the AI to state laws over the holopad. Modifies say-code to return true on success.
...
Say-code updated to return true on success.
This allows for quitting early when stating laws without having to duplicating the checks made in the say-code.
2014-07-17 12:43:41 +02:00