Commit Graph

43 Commits

Author SHA1 Message Date
Zuhayr 059532c155 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2014-09-01 22:03:29 +09:30
Walter0o c0b6f82ad0 emergency HTML/JS injection fix MK2, the underping.
fixes a minor oversight in proc order after i shuffled them around.
2014-08-27 15:42:59 +02:00
Walter0o 89d2c956ca emergency HTML/JS injection fix.
sanitation of status display input was missing everywhere.
2014-08-27 14:42:58 +02:00
Zuhayr b47d91b612 Merge resolution, master into dev. 2014-08-21 12:01:38 +09:30
Zuhayr df6723deb0 Merge pull request #6036 from mwerezak/power-net
Fixes laptop power draw, improves cell chargers
2014-08-18 21:04:02 +09:30
mwerezak 6d6413a59b Fixes laptop power draw, improves cell chargers
Cell chargers no longer call use_power() in their process()
2014-08-17 15:30:29 -04:00
Walter0o 0c6dff3c7a should fix #6030
basically the same as
https://github.com/Ccomp5950/Baystation12/commit/569e8361dc074ec83a767b3944f43c050aff9663
for the computer3 laptop.
2014-08-17 18:18:07 +02:00
Atlantiscze 40027d85bd Fixes #5974
- Fixes possible disappearance bug for Laptops
2014-08-13 08:19:46 +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 06ca10df6b computer3 ntos topic exploit prevention 2014-07-31 09:48:17 +02:00
Walter0o 0aadca2fab computer3 program topic protection 2014-07-31 09:42:26 +02:00
Walter0o a8baa2c855 computer3 remote view exploit fix
you could look at any atom for a tick.
could need improvement, does not check camera network at the moment,
because of the costly and temporary nature of the getter proc.
2014-07-31 09:34:58 +02:00
Walter0o 61a1904e78 prisoner computer3 topic exploit fixes
fun : you could trigger grenades this way
2014-07-31 09:28:47 +02:00
JimTheCactus 47dbc9c374 Merge branch 'dna_field_fix' into computer3_text_field_fix
Conflicts:
	code/WorkInProgress/computer3/computers/medical.dm
2014-07-30 01:29:17 -06:00
JimTheCactus e02ccd5564 Ported blank field patch to Computer3 systems 2014-07-30 01:25:15 -06: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
Zuhayr ff38aca774 Merge resolution. 2014-07-21 16:17:15 +09:30
Atlantiscze c127fee6b4 Adds battery status icon to NTOS
- Laptops now have status icon which shows status of their internal battery.
- Adds support for "status bar" - allows more status icons in future (such as, network connection? time? whatever), status bar icons should be 16x16px
2014-07-20 15:15:29 +02:00
Atlantiscze 06dcb07fb8 Merge branch 'laptop-multifix' of https://github.com/atlantiscze/Baystation12 into laptop-multifix 2014-07-20 01:55:42 +02:00
Atlantiscze 5cfe7d9dd8 Fixes #5670
- This also includes other vending machines than laptop vendor. They now actually take money from your account instead of pretending to do so and giving stuff for free. No moar spess communism.
- Vending machines now ask for PIN code only if your account settings require it (ie: Security levels 1 or 2. Default is 0 - only ID card swipe)
2014-07-20 01:55:11 +02:00
Atlantiscze 95a45a646f Fixes #5572
- Detective-vended laptops now have medical records program installed.
2014-07-18 12:14:33 +02: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
Zuhayr 4f032ef7f4 Fixes #5600 2014-07-14 10:43:47 +09:30
Walter0o a36d0b3ff4 part 3 of fixing #5521 2014-07-10 17:04:27 +02:00
Walter0o 6bff77c0ba part 2 of fixing #5521 2014-07-10 16:55:38 +02:00
Walter0o 323ced2803 part 1 of fixing #5521 2014-07-10 16:55:23 +02:00
Walter0o cd0c49ab81 another laptop verb range fix 2014-07-10 16:31:29 +02:00
Walter0o e1a8e95081 fixes rangecheck on laptop verbs 2014-07-10 16:24:38 +02:00
Walter0o 5b3f7b30c0 fixes #5548
missing range check for Alt click on laptops
2014-07-10 12:50:20 +02:00
Boop 8c3f6f2226 fix a world << THING
(help)
2014-07-05 20:28:08 +01:00
Zuhayr a55b447100 Fixes #5450 2014-07-02 05:37:26 +09:30
DJSnapshot 0ac199f92d shuttle controller fix 2014-06-23 15:15:53 -07:00
DJSnapshot c007b013d0 Clicking the magnetic card slot option on the desktop will eject all cards. No more eating cards! 2014-06-23 14:43:43 -07:00
DJSnapshot db6a403c2f uses get_turf instead of get_turf_loc now 2014-06-23 02:09:17 -07:00
DJSnapshot d8ef1647a7 Forgot to commit welcome.dm 2014-06-23 01:54:03 -07:00
DJSnapshot e96b682cf4 laptop vendor! 2014-06-22 23:45:38 -07:00
DJSnapshot 2025e84b67 fixes for potential runtimes. 2014-06-22 23:42:47 -07:00
DJSnapshot aa27bdc64c laptop vending part 1. and more cleanup. 2014-06-22 17:19:40 -07:00
DJSnapshot 41362280f3 lowercase ntos by request of mloc + updates to background. 2014-06-22 03:46:36 -07:00
DJSnapshot 7a5a3d47ae Fixed up security, medical, card, and crew. Made Computer 3 actually do what it's supposed to do. 2014-06-22 03:31:06 -07:00
DJSnapshot 9de9dab362 Initial commit of Computer 3 from Paradise, along with a bunch of fixes. 2014-06-22 02:08:42 -07:00