Commit Graph

25397 Commits

Author SHA1 Message Date
Spades
bc3f4fb0dc Polishing oversights away 2017-05-27 05:07:34 -04:00
Spades
3ff9d441f9 Finishes fixing ammo inconsistencies 2017-05-27 04:39:49 -04:00
Spades
8579adcc53 Naming convention of ammo is now consistent
s = Speedloaders. (Functionally the same as clips, but they're not
_really_ the same thing, just in case we change these later.)
c = Clips. (Can also be used to fill other magazines.)
m = Magazine. (Holds ammo rounds.)
a = Ammo. (Individual rounds of ammo.)
2017-05-26 19:32:23 -04:00
Neerti
aad701fee7 Merge pull request #3463 from VOREStation/multiz-consoles
Multiz consoles
2017-05-26 12:06:49 -04:00
Leshana
dfbba572cf Prevent falling from sudden gravity restoration if buckled.
* Also stops the floating animation while you're buckled, so you know.
* Resolves https://github.com/VOREStation/VOREStation/issues/1458
2017-05-25 18:07:32 -04:00
MagmaRam
a7d99942f4 Merge pull request #3443 from Anewbe/sifDefenseForce
[Lore] Renames the Sif Homeguard to Sif Defense Force
2017-05-23 20:38:44 -05:00
Anewbe
475756bb8d Merge pull request #3466 from Schnayy/clothing_pack_1
Adds 4 new clothing sprites & puts them in the loadout.
2017-05-23 20:26:32 -05:00
Neerti
f76414ac7e Merge pull request #3467 from Anewbe/fbp_cooking
FBPs should cook again.
2017-05-22 23:46:49 -04:00
Neerti
a07a63b610 Merge pull request #3464 from VOREStation/vplk-teleporter-init
Fix teleporter discovery of hub and station requiring specific facing.
2017-05-22 23:25:18 -04:00
Anewbe
23f70f0b3a FBPs should cook again. 2017-05-22 22:24:31 -05:00
Neerti
21121e137d Merge pull request #3461 from Anewbe/more_potatoes
Ups the number of autotraitors to 4
2017-05-22 23:23:53 -04:00
Anewbe
8cd670530f Merge pull request #3462 from SpadesNeil/bolt-action
Buffs Bolt Action rifle damage to be less useless
2017-05-22 22:22:00 -05:00
Schnayy
b1cb74b318 Adds 4 new clothing sprites & puts them in the loadout.
Peacoats: Requested.

Black corset/skirt combo: Requested.

Flower dress: First ss13 sprite I made, threw it in.

Red swept dress: A new, nicer red dress.
2017-05-22 18:08:01 -05:00
Leshana
d41f6cce04 Ensure computers work on centcom or when only one zlevel is accessible. 2017-05-22 16:18:26 -04:00
Leshana
b4ca6b11e1 Switch nanomap computers over to using get_sensor_levels()
* Added a proc to the map datum which returns what zlevels a nanomap capable computer should display.
* Updated the atmos control, power monitoring, crew monitoring, and camera consoles to use it.
* Changed templates to not show the map button if no map levels are available.
2017-05-22 16:18:26 -04:00
Leshana
e16a3f4b3d Updated crew monitor computer to support multi-z output and nanomaps. 2017-05-22 16:15:47 -04:00
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
Leshana
dffe949c3a Fix teleporter discovery of hub and station requiring specific facing.
* Teleporter would only search in the direction it was facing.  As long as computers have no directional sprites this is fine, but otherwise it is a problem.  Might as well do the sensible thing and search adjacent turfs.
2017-05-21 22:59:14 -04:00
Spades
4abde8007a Description fix. 2017-05-21 20:48:12 -04:00
Spades
79b75b1857 Buffs Bolt Action rifle damage slightly
My reasoning behind this request is because, aside from a small armor
pen value, a puny little .45 pistol is better in every other way to a
bolt _rifle_, and that just doesn't make any sense, and isn't very fun.
It basically just exists as a lousy gimmick right now.

This PR makes it slightly less of a gimmick and more of a weapon people
might actually use if they don't have many options. This weapon is
especially popular during cult rounds when Cargo needs some kind of
guns.

ToDo: Fix the Lever rifle to not have speedloader ability. Also, why
does the Lever rifle already use 7.62 ammo? Did anyone know this?
2017-05-21 20:46:12 -04:00
Anewbe
f05c3d9220 Ups the number of autotraitors to 4 2017-05-21 16:40:43 -05:00
Anewbe
6bd9f31b4b Removes the Home Guard beret 2017-05-21 14:40:48 -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
82194a63c0 Adds specificity to SifGuard's HQ 2017-05-12 16:53:11 -05:00
Anewbe
84df53fcf7 Merge pull request #3431 from Cerebulon/suitcleanup
Cleans up uniform loadout menu.
2017-05-12 16:25:39 -05:00
Anewbe
3109419c93 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sifDefenseForce 2017-05-12 16:22:09 -05:00
Anewbe
69896f3133 Renames the Sif Homeguard Corps to Sif Defense Force 2017-05-12 16:21:51 -05:00
Sarmie
78880cd18e Disfigure check 2017-05-11 20:24:21 -04:00