Commit Graph

1175 Commits

Author SHA1 Message Date
Zuhayr
ea8b08c49b Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into hydroponics 2014-07-25 22:34:40 +09:30
Zuhayr
4d1812ba2b Hydroponics rewrite, details will be in PR. Big commit. 2014-07-25 22:16:04 +09:30
Mloc-Argent
d5e9851b62 integrate XGM into the code
New turf proc: assume_gas().  Maps to air.adjust_gas_temp().
Lots of optimizations to processing, fire, lighting, HasEntered() and
 more.
Zones now process all fire data and existance in one go, fire objects
 only handle spreading.
Most code has been ported straight so some of it mightn't be ideally
 structured for the new gas_mixtures.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2014-07-22 19:52:12 +01:00
Zuhayr
60d9d3d5e6 Merge resolution. 2014-07-21 16:34:38 +09:30
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
f795712a95 Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into dev 2014-07-16 19:30:41 +09:30
Zuhayr
d050f0a30b Merge pull request #5620 from Decius-R/loyalty_implants
Loyalty Implants
2014-07-15 10:30:48 +09:30
Decius
203c36114d Made spawning with a loyalty implant compliant to configuration...
Created a proc for being implanted with loyalty implant which
checks for the configuration for whether or not it will work. If it is
enabled, it continues on-- if it is disabled, it returns from the proc.

Also made secure closets not automatically spawn them unless the config
is set to allow it.

Admin 'loyalty implanting' via the panel is now compliant to the
configuration file. If preferred, I am willing to make an override variable
to the proc that will allow admins to do it anyway.

Supply pack for it commented out due to inability to make it conform.
Easy enough to re-add back for anyone downstream if they wish it. Same
applies to the design.


Signed-off-by: Decius <deciusreln97@gmail.com>
2014-07-14 17:21:11 -04:00
Zuhayr
4f032ef7f4 Fixes #5600 2014-07-14 10:43:47 +09:30
Zuhayr
5f8723352d Merging robot_modules.dm and master controller setup. 2014-07-14 09:10:02 +09:30
Mark Aherne
7e7e6cd8ac Continued work in progress on a major revision of the NanoUI templating system. 2014-07-11 10:48:42 +01:00
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
Mloc-Argent
64d2a69a32 Merge remote-tracking branch 'upstream/master' into dev
Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/modules/mob/living/carbon/human/human_damage.dm
2014-07-06 17:50:53 +01:00
Boop
8c3f6f2226 fix a world << THING
(help)
2014-07-05 20:28:08 +01:00
Zuhayr
b670cdcdf1 Fixes #5483 2014-07-04 17:48:12 +09:30
Chinsky
5c7080a774 Added proc to imitate movement of stars. Changes icon state and throws all unanchored items in space.
Added var denoting which direction is fore of the ship.
Adjusting speed now applies movement effect on ship's zlevel.

Added working engines system. Only defined type currently is thermal engine.
Acceleration is now based on total thrust and ship's mass.
Added engine control console.

Changed shuttle control console to use custom interface to pick destinations.
Shuttles can now go between any types of sectors, not just ship->sector.
Shuttles cannot return to base if they are too far on overmap.

Moved helm computer to NanoUI.
Helm computer now stores navigation data records instead of polling info from actual overmap objects every time.
Metaobjects now can define if sector is well known, in which case it will be automatically added to helm computer records on creation.
Can add and delete records.
2014-07-03 04:47:50 +04:00
Zuhayr
b9c6b7b77d Merge with master. 2014-07-02 06:59:11 +09:30
Zuhayr
34f7ba30d5 Fixes guest terminals only allowing 29 minute passes. 2014-07-02 06:46:42 +09:30
Zuhayr
a55b447100 Fixes #5450 2014-07-02 05:37:26 +09:30
PsiOmega
332cf214a2 Partially corrects #5438
Central atmospherics computer now expects atmos access, rather than CE access.
2014-07-01 20:48:31 +02:00
Mloc-Argent
6630e4838e Merge remote-tracking branch 'upstream/master' into dev-freeze
Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/game/machinery/alarm.dm
2014-06-30 23:44:46 +01:00
Chinsky
b018e9e150 Fixed #5374
Also added cancellation buttons here and there.
Prevented an exploit, resulting in ability to issue same passes with different ID, even if it doesn't have those accesses.
2014-06-30 16:11:42 +04:00
Chinsky
59108f750d Added ship movement delay.
Made autopilot actually move ship towards destination.
2014-06-30 03:01:21 +04:00
Chinsky
7f8d2555e2 Adds interface to the helm console. 2014-06-30 02:22:50 +04:00
Chinsky
5df822f148 Added small readme file for overmap system. 2014-06-29 06:49:09 +04:00
Chinsky
e7684dd6e9 Adds overmap system and examples of it's usage.
Unticked, as it disables space edge transition.
2014-06-29 06:48:21 +04:00
mwerezak
909e8a4e95 Fixes #4688
Or attempts to at least.
2014-06-28 17:42:27 -04:00
Chinsky
c6d6bdcb58 Added system for overmap building.
-metaboject with zlevel info that should be placed on sector/ship zlevel
-overmap object that represents a map zlevel
-startup hook for building the overmap
2014-06-28 14:05:44 +04:00
DJSnapshot
0ac199f92d shuttle controller fix 2014-06-23 15:15:53 -07:00
DJSnapshot
7a3bee3823 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into laptop 2014-06-23 15:06:02 -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
Mloc-Argent
a33cb7272b Merge remote-tracking branch 'upstream/master' into dev 2014-06-23 20:57:47 +01: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
488c4f4b84 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into laptop
Conflicts:
	code/setup.dm
2014-06-23 00:25:39 -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