PsiOmega
a1dd07db38
Merge remote-tracking branch 'upstream/dev' into StatusDisplay
...
conflicts:
maps/tgstation2.dmm
2014-08-26 14:21:29 +02:00
PsiOmega
a3b683d10f
Merge remote-tracking branch 'upstream/dev' into StatusDisplay. Moved code in New() into initialize().
2014-08-26 00:03:18 +02:00
PsiOmega
9eef5ff877
Status displays can now show station time. Also prepares for making brig timer inherit from status display.
2014-08-25 19:30:56 +02:00
Kelenius
a1348faa8c
Cables are now stacks
2014-08-25 18:54:35 +04:00
PsiOmega
ad387fda96
One can now update crew record photos using a security console.
2014-08-22 19:39:35 +02:00
Chinsky
871456f131
Merge pull request #6084 from PsiOmegaDelta/MoreNounce
...
Announcement Refactoring
2014-08-21 21:53:03 +04:00
PsiOmega
68bf885e6b
Announcement system refactoring.
...
Turns announcements into a datum based system to allow a variety of configurations.
Current configuration options include:
Admin logging
Which sound that should play when announced, if any
If the announcement should be stored as a newscast
Request console/standard announcements currently match priority announcements, but have a smaller style/footprint.
Player announcements now include the assignment and name of the person (or the id rather) who made it.
Have currently only updated the request console and all announcements which previously used captain_announce().
Affected automated announcements, such as shuttle messages, should be exactly the same as before.
2014-08-21 06:34:41 +02:00
Chinsky
fd486ea369
Merge pull request #6064 from PsiOmegaDelta/Announce
...
AI Announcements & Verbs
2014-08-21 01:37:55 +04:00
PsiOmega
a2253617cf
Makes it possible for the AI to make station wide announcements. Improved AI verb handling in case of death/restoration.
2014-08-19 21:09:14 +02:00
mwerezak
c42d9171d6
Makes power monitor a power machine again
...
Also moved the power monitor code to modules/power
2014-08-19 01:45:23 -04:00
mwerezak
65bb47b7ec
Setting computer vars on de/construction
2014-08-18 19:35:28 -04:00
mwerezak
52a6f2f9e0
Removes more unused vars from circuitboards
2014-08-18 18:28:39 -04:00
mwerezak
bdb2a45700
Makes power monitor computers actual computers
...
Removes the powernet var from circuit boards. Power monitors get their
powernet from the cable underneath them anyways.
2014-08-18 18:27:51 -04:00
PsiOmega
11ce777d9c
Fixes #6027
...
Creates two proper monitor circuits for Engineering/Mining.
Adds air alarms in the Research access foyer.
Relocates camera in Misc. research to a more central location.
Ensures there are enough Telecommunication Satellite SMES units to meet power demand.
2014-08-18 22:37:54 +02:00
Zuhayr
f09d1218fe
Master to dev merge.
2014-08-11 17:23:40 +09:30
mwerezak
e1dc7d436b
Fixes icons and other things not updating when the master controller updates power status.
...
This was due to the master controller using update_powered_status()
instead of power_change(), but many machines override power_change() to
do various things when the machine gains or loses power.
2014-08-10 03:45:20 -04:00
Walter0o
fa15a25b67
fixes #5934
2014-08-10 02:17:06 +02:00
Zuhayr
3e4c80e874
Merge pull request #5848 from JimTheCactus/computer3_text_field_fix
...
DNA Field Fix and Field Validation
2014-08-01 21:59:34 +09:30
Walter0o
7416d26197
robot computer emagging exploit fix
...
so an emagged borg can in turn emag all others ?
the more you know.
seems extremely OP to me but i am just closing the exploit, not changing the game.
2014-07-31 10:38:34 +02:00
JimTheCactus
19b032d8e8
Fixed bad reference to active 1 in the medical computer's DNA field inputs.
2014-07-30 01:09:26 -06:00
JimTheCactus
4d920bef59
Corrected variable edited field for blood dna. Was dna, not b_dna like it should be.
2014-07-29 23:19:29 -06:00
Mloc-Hibernia
a2dc7b827b
Merge remote-tracking branch 'upstream/pr/5689' into dev
...
Signed-off-by: Mloc-Hibernia <colmohici@gmail.com >
Conflicts:
code/game/machinery/computer/crew.dm
2014-07-26 14:25:24 +00:00
Zuhayr
5da36d265e
Merge resolution with PDA nanoui.
2014-07-25 22:57:53 +09:30
Ccomp5950
569e8361dc
Crew Monitor will no longer show "weird characters"
...
It has been talked to and feels very sorry for it's actions.
Well that and NanoUI doesn't like byond text-macros (/improper) in this case, so we just sanitize it just incase the crew monitor isn't playing nice that day.
2014-07-22 20:21:22 -05:00
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
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
Zuhayr
f4ff51f146
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev
2014-07-16 19:32:00 +09:30
JimTheCactus
41904850d4
Fixed not-quite-blank field issues in the various record keeping computers.
...
Added trim to most fields in Medical Computer
Added trim to most fields in Staff Computer
Added name verification in Staff Computer
Added trim to most fields in Security Computer
Added name verification in Security Computer
2014-07-14 20:55:39 -06:00
Mark Aherne
7e7e6cd8ac
Continued work in progress on a major revision of the NanoUI templating system.
2014-07-11 10:48:42 +01:00
PsiOmega
9b97420e97
The AI system integrity restorer no longer needs head AND captain access.
2014-07-04 00:12:41 +02:00
Zuhayr
04a6ea92db
Adds Eject ID verbs to record computers.
2014-07-02 06:17:54 +09:30
Zuhayr
30385c2237
Fixes an access issue with the ID computer.
2014-06-30 08:48:51 +09:30
mwerezak
b8fb66380b
Fixes escape shuttle not being callable from the communications console
2014-06-28 23:26:58 -04:00
mwerezak
25bcdfa39e
Merge remote-tracking branch 'upstream/dev' into emergency-shuttle
...
Conflicts:
code/setup.dm
2014-06-24 00:09:17 -04:00
mwerezak
9e0562b16c
Adds shuttle controller
...
Moves all ferry shuttle processing into one place: the new shuttle
controller.
Also cleans up the emergency shuttle controller a bit more and fixes
multi-shuttle cooldown.
2014-06-23 22:00:57 -04:00
Mloc-Argent
a33cb7272b
Merge remote-tracking branch 'upstream/master' into dev
2014-06-23 20:57:47 +01:00
mwerezak
dc304026a9
shuttle_controller now uses a shuttle datum
2014-06-22 18:10:56 -04:00
Chinsky
86db41a582
Merge branch 'master' of https://github.com/Baystation12/Baystation12
...
Merge branch 'master' of https://github.com/Baystation12/Baystation12
Optimizes crew console scanning to only look for mobs instead of ALL clothing items in the world.
2014-06-22 14:30:50 +04:00
GinjaNinja32
8bb32e00fa
Fixes ID computer's missing Security section
2014-06-16 21:32:58 +01:00
Zuhayr
0722775bda
Merge pull request #5207 from mwerezak/get_turf_loc-cleanup
...
Cleans up get_turf_loc()
2014-06-12 18:13:01 +09:30
Zuhayr
4ee8f56c29
Merged master to dev, manually fixed merge issues in map, may be some left.
2014-06-11 18:11:41 +09:30
mwerezak
a8816823a5
Replaces get_turf_loc() with get_turf()
...
The former does exactly the same thing as get_turf(), except it runtimes
if one of the atoms has a null loc.
2014-06-10 13:43:11 -04:00
Hubblenaut
f12ee3f7b3
Fixes some printouts causing a runtime error when photocopied
2014-06-07 18:27:22 +02:00
Zuhayr
dfa6d8ef15
Merge branch 'shuttlecontroller' of https://github.com/Zuhayr/Baystation12 into dev
2014-06-04 19:14:00 +09:30
Zuhayr
7a56a174dc
Converted Syndicate shuttle over to multi-shuttle setup.
2014-06-04 00:08:10 +09:30
Zuhayr
54b08ff55a
Moved the Vox skipjack console over to a multi-destination shuttle datum setup.
2014-06-03 23:21:10 +09:30
Zuhayr
ba4293d5c4
Merge pull request #5125 from GinjaNinja32/crew-monitor
...
Crew monitor
2014-06-03 20:26:04 +09:30
Zuhayr
00c81bb675
Moved engineering, research and mining shuttles to a generalized system with its own directory structure.
2014-06-03 15:26:34 +09:30
GinjaNinja32
a786f72e33
Fix NanoUI autoupdating
2014-06-02 09:59:38 +01:00
