Commit Graph

15657 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
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
Anewbe
23f70f0b3a FBPs should cook again. 2017-05-22 22:24:31 -05: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
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
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
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
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
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
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
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
Sarmie
06d5d0b189 Go 2017-05-11 19:56:20 -04:00
Cerebulon
2c327a42fc Fixes inexplicable capital letters in Lawyer and Suit sometimes. 2017-05-10 03:43:03 +01:00
Neerti
0ef887794b Merge pull request #3424 from Anewbe/meson_vision
Supermatter Hallucination Tweak
2017-05-09 19:11:31 -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
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
Neerti
1f737cb826 Merge pull request #3427 from Anewbe/straight_jacket
Fixes a straightjacket bug
2017-05-07 14:12:26 -04: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
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
Yoshax
c808a6fb66 Removes Unathi from chin bob 2017-05-06 20:27:28 +01:00
Yoshax
6635857cf1 Ports a bunch of hair or something 2017-05-06 19:37:55 +01:00
sabiram
6cfc825f53 Adds and fixes some hairstyles 2017-05-06 19:30:59 +01:00
SiegDerMaus
e64f0bb97b Adds Chin Length Bob
A new haircut for those who like bobs, but always hated how short the
one already in game is.
2017-05-06 19:26:22 +01:00