Commit Graph

25373 Commits

Author SHA1 Message Date
Arokha Sieyes
f79a23ea48 Fix computers above z6 2017-05-22 16:15:47 -04:00
Leshana
fbb1a75438 Enabled multi-z nanomap in nanoui on power monitor, sec camera, and armos computers. 2017-05-22 16:15:47 -04:00
Leshana
b89897e8a2 Enhances power monitor computers to use the nano-map to show APC locations.
* In addition to showing APCs on a sensor'd powernet, the same APCs can be shown on the nano-ui map!
* Hover tooltip shows basic information on the APCs.
* Makes it easier to spacially understand where APCs are when you send people out to work on them.
2017-05-22 16:15:47 -04:00
Leshana
388d6785ec Add nanomap to the Atmos Control Computer
* In addition to showing a list of air alarms, the atmos computer now shows them as pins on the nanomap.
* Since the atmos computer shows all z-levels, the nanomap will be mutli-z.  Limited to station levels of course.
2017-05-22 16:15:47 -04:00
Anewbe
5744812469 Merge pull request #3458 from VOREStation/vplk-mapz
EZ Map Datum Setup
2017-05-22 14:14:27 -05:00
MagmaRam
2a42f9ef55 Merge pull request #3405 from Anewbe/bullet_swap
Makes the 556 and 762 calibers more appropriate to their naming
2017-05-21 13:17:58 -05:00
Leshana
5594c9db39 An easier and more maintainable way of setting up the map datum.
* Settings for specific z-levels are defined in datum types, allowing the lists of Z levels to be automatically configured.  This solves the problem of being unable to use the z-level #defines in associative lists.
* Converted the example and northern star maps to use the new system.
2017-05-21 14:16:48 -04:00
Leshana
ecd19ee1af Adds an admin verb to debug the current map datum.
Useful for making sure it loaded right.
2017-05-21 14:16:39 -04:00
Leshana
721d5f8934 Enhance machine frames to be flexible about icons and icon states.
* Add a proc and variable to /datum/frame/frame_types to allow overriding the icon and icon_state used whlie building.
2017-05-19 23:23:17 -04:00
Neerti
8a2f69d439 Merge pull request #3454 from VOREStation/vplk-sundry-fixes
Sundry small bugfixes
2017-05-19 13:54:30 -04:00
Anewbe
098e2ffff8 Merge pull request #3436 from VOREStation/aro-pol-jammer
Subspace jammer item
2017-05-18 19:12:26 -05:00
Leshana
d2ca5df408 Prevent runtime if accidentally have a spawnpoint authorized by using_map but without any landmarked turfs. 2017-05-17 20:43:03 -04:00
Arokha Sieyes
c79bdb056b Holodeck menu tweak
Prevent the menu item from updating if the loaded area doesn't update due to the mandatory delay between changes for example
2017-05-17 20:43:03 -04:00
Arokha Sieyes
71feaa4f8f Communications computer fix
Stupid code. Why would you do that.
Reference using_map instead of hard coding z levels.
2017-05-17 20:42:55 -04:00
Leshana
dfecfe34e6 Stop turning op table!
* Operating table and computer liked to literally spin around during initialization due to someone using `dir` as a loop counter without declaring it as a local variable.
2017-05-17 20:16:36 -04:00
Anewbe
eab2a410ba Merge pull request #3453 from Eimras/Diona-shock-fix
Diona don't get shocked working on electrical things
2017-05-17 17:42:01 -05:00
Sarmie
84a7f64010 Re-branch to fix GIT stuff 2017-05-17 17:17:45 -04:00
Neerti
e0725d738b Merge pull request #3451 from VOREStation/vplk-loremaster-runtime
Fix runtime in air_traffic.dm due to bad organizations in loremaster.
2017-05-17 00:51:47 -04:00
Leshana
75e9f619fa Fix runtime in air_traffic.dm due to bad organizations in loremaster.
* Loremaster was loading all subtypes of /datum/lore/organization, but some intermediate subtypes are never meant to be used (such as /datum/lore/organization/mil)
* These intermediate subtypes have no names, and no ship_prefixes, so crash the ATC.
* Fix by not loading ones not meant to be loaded.  Detected by checking if they have a non-null name.
2017-05-15 23:14:34 -04:00
Leshana
ea223cd5fc Prevent lighting_overlay objects from being moved around.
* lighting_overlay objects belong to a turf. Turfs never move. Neither should the lighting_overlay, even of an overzealous shuttle controller thinks they should.
2017-05-15 17:16:40 -04:00
Anewbe
0bfc6de678 Trashbag can hold more 2017-05-13 10:20:45 -05:00
Anewbe
4caa7088d6 Merge pull request #3441 from Eimras/diona-regen-fix
Diona regen fix
2017-05-12 19:51:19 -05:00
Sarmie
3ca8bc1375 Disfigure Check Fix 2017-05-12 20:42:36 -04:00
Anewbe
903a2a2e5f Fixes a few things, adds 556 clips 2017-05-12 18:03:49 -05:00
Anewbe
84df53fcf7 Merge pull request #3431 from Cerebulon/suitcleanup
Cleans up uniform loadout menu.
2017-05-12 16:25:39 -05:00
Sarmie
78880cd18e Disfigure check 2017-05-11 20:24:21 -04:00
Sarmie
06d5d0b189 Go 2017-05-11 19:56:20 -04:00
Leshana
df9e76efd6 Small ZAS Optimization
Minor optimization; eliminates a few proc calls when managing zone
connections by turning check() into a macro.
2017-05-10 20:12:13 -04:00
Cerebulon
2c327a42fc Fixes inexplicable capital letters in Lawyer and Suit sometimes. 2017-05-10 03:43:03 +01:00
Arokha Sieyes
60889202c4 Moves icon 2017-05-09 20:45:03 -04:00
Neerti
d900b52a33 Defib Fixes
Fixes runtime when screwdrivering the defib to remove the powercell.
Husked people can no longer be revived.  This is because otherwise they could become alive again but remain husked.
2017-05-09 20:14:04 -04:00
Arokha Sieyes
5c7ef1bbef Subspace jammer item
Jams the three devices that I'm aware of that use subspace communications: Headsets, PDAs, and Communicators.

All three will be unable to communicate if in range of a jammer. The default range is 7 turfs, the battery that comes in the jammer is a weapon cell (just to make it a little harder to find replacements) and lasts 60 seconds. The range and power use are variables.

Speaking through a headset will produce 'soft' or 'loud' static depending on how far you are, allowing you to sort of dead-reckon your way to a placed jammer. You can just carry them, otherwise.

I've got no experience with adding tator items so I'll leave that sort of thing up to you guys.
2017-05-09 20:13:43 -04:00
Neerti
0ef887794b Merge pull request #3424 from Anewbe/meson_vision
Supermatter Hallucination Tweak
2017-05-09 19:11:31 -04:00
Neerti
5381e55187 Makes code compile.
Wew.
2017-05-09 19:04:09 -04:00
Anewbe
801d91ba8b Merge pull request #3421 from Neerti/5/5/2017_technomancer_changes
More Technomancer
2017-05-09 17:54:53 -05:00
Neerti
48b7ef38fd Merge pull request #3422 from Anewbe/engineering_timelock
Adds a 3-day timelock to the Engineering job
2017-05-09 18:50:12 -04:00
Neerti
ec9617a593 Merge pull request #3433 from Yoshax/fleshlights
Nerfs flashlight brightness due to them being different due to soft lighting
2017-05-09 15:32:22 -04:00
Yoshax
1c07f11def Nerfs flashlight brightness due to them being different due to soft lighting 2017-05-09 17:00:15 +01:00
Anewbe
cae50c2818 Merge pull request #3428 from Anewbe/explosions
Explosion sounds
2017-05-08 19:12:32 -05:00
Anewbe
42fe5d9ed6 Merge pull request #3412 from VOREStation/pool-closed
Removes the datum pool, as it is not performant.
2017-05-08 17:21:24 -05:00
Cerebulon
0ce6ca7290 Cleans up uniform loadout menu.
Suits are now mostly under one-piece (subtypes of 'lawyer') and modular (subtypes of 'suit_jacket') selection menus. Croptops also under selection menu.
2017-05-08 00:31:31 +01:00
Anewbe
bce6db1135 Fixes another thing 2017-05-07 18:15:54 -05:00
Anewbe
51d07afdc3 Dunno how it compiled last time 2017-05-07 14:02:43 -05:00
Neerti
1f737cb826 Merge pull request #3427 from Anewbe/straight_jacket
Fixes a straightjacket bug
2017-05-07 14:12:26 -04:00
Anewbe
e93e87b998 Merge pull request #3429 from LorenLuke/Holidays
Adds two holidays
2017-05-07 13:09:18 -05:00
Anewbe
32271f7ae6 Merge pull request #3425 from Yoshax/hair
Ports a bunch of hair from Bay
2017-05-07 11:34:46 -05:00
LorenLuke
de4de97e69 #3384, but works. 2017-05-07 09:20:10 -07:00
Anewbe
12e13e7f67 Explosion sounds 2017-05-06 21:34:38 -05:00
Anewbe
5bed51da31 Fixes a straightjacket bug 2017-05-06 15:40:38 -05:00
Neerti
1d5afefea9 Fixes Logic Circuits
They should now function properly.
2017-05-06 16:35:06 -04:00