Commit Graph

17012 Commits

Author SHA1 Message Date
Arokha Sieyes
684f570d0d Trait Tweaks
Adds blood color as a custom species setting
Adds photoresistant trait
Changes haste and slowdown traits to be taj and tesh speeds
2017-05-30 11:35:40 -04:00
Arokha Sieyes
d9c845a298 Don't sanitize out Custom Species unless they are changing species 2017-05-29 17:19:03 -04:00
Arokha Sieyes
4d8b465cd9 Basically initial working traits 2017-05-29 05:08:25 -04:00
Arokha Sieyes
9f7d6269bc Merge pull request #1566 from VOREStation/vplk-tether-map-datums
Switch Tether over to use the map_z_level datum.
2017-05-26 23:05:08 -04:00
Arokha Sieyes
c8eb369ed8 Merge pull request #1564 from VOREStation/polaris-merge-2017-05-26
Polaris Sync 2017 05 26
2017-05-26 19:27:06 -04:00
Leshana
f4b9676bdc Switch Tether over to use the map_z_level datum.
* Integrate the holomap settings into the map datum.
* Create map_z_level datums for the tether.
2017-05-26 18:57:07 -04:00
Leshana
47a0622ccb Temporarily adjust our holomap overrides to account for the incoming enhancements. 2017-05-26 18:23:54 -04:00
Leshana
8c8e04a0a0 Converted VOREStation custom guns and ammo to handle the swap of 5.56 and 7.62 ammo.
* Swapped our loot drops and guns to keep the damage of loot and guns the same.
* Edited the c762 magazine definition back to keep the same ammo count in each magazine type as before.

Conversion chart used:
==OLD==     max_ammo    ==NEW=      max_ammo
a556        10          s762        10
a556m       20          c762        (20)

s762        10          c556        20
c762        20          c556/ext    30
a762        50          a556        50
2017-05-26 17:54:04 -04:00
Leshana
8e93d971fb Revert back "Tweaks hallucinations from the supermatter"
VOREStation prefers only mesons protect from supermatter hallucinations, so keeping the code the way it was pre-sync.
This reverses commit ed66150523.
2017-05-26 16:21:31 -04:00
Leshana
5f5ea3ea3b Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-merge-2017-05-26
# Conflicts:
#	code/game/gamemodes/technomancer/spells/insert/mend_burns.dm
#	code/game/gamemodes/technomancer/spells/insert/mend_metal.dm
#	code/game/gamemodes/technomancer/spells/insert/mend_organs.dm
#	code/game/gamemodes/technomancer/spells/insert/mend_wires.dm
#	code/game/machinery/computer/Operating.dm
#	code/game/machinery/computer/camera.dm
#	code/game/machinery/computer/communications.dm
#	code/game/machinery/computer/security.dm
#	code/game/machinery/computer/skills.dm
#	code/game/objects/items/devices/radio/jammer.dm
#	html/changelogs/.all_changelog.yml
#	maps/~map_system/maps.dm
#	nano/images/nanomap_z1.png
#	nano/images/nanomap_z5.png
2017-05-26 15:29:46 -04:00
Arokha Sieyes
797341bbfa Merge pull request #1561 from VOREStation/vplk-turbolift-fire-mode
Turbolift Firefighter Mode
2017-05-26 14:55:13 -04:00
Leshana
28b73d7868 Adds "firefighter mode" to turbolifts
* Adds a priority call mode that allows heads and first responders to cancel all calls and summon the lift to their floor immediately.
* Adds a firefighting mode that turns the lift over to manual control, doors only open when manually opened, all call buttons ignored.  For use during fires.
2017-05-26 14:45:00 -04:00
Yoshax
f8c73635da Adds vorrarkul's custom item 2017-05-26 19:36:29 +01:00
Leshana
4f5c66e94f Allow turbolift automapping to build a lift without elevator car walls.
* Relying on external walls prevents the need for double-thick walls that take up more space.  Useful for some maps.
2017-05-26 14:02:53 -04:00
Leshana
f61d4ecaaa Turbolift bugfix: Refresh inner panel dialog
* Refresh when we push buttons to see the effect of what we did.
* Refresh when we remove floors from the queue to see the highlighting update.
2017-05-26 14:02:40 -04:00
Neerti
aad701fee7 Merge pull request #3463 from VOREStation/multiz-consoles
Multiz consoles
2017-05-26 12:06:49 -04:00
Yoshax
fbec354c51 Fixes AMI suit issue 2017-05-26 02:09:32 +01:00
Arokha Sieyes
70e03f2377 Merge pull request #1553 from VOREStation/sundry-runtimes2
Sundry runtimes 2
2017-05-25 16:39:39 -04:00
Arokha Sieyes
781ff2fc31 Merge pull request #1550 from Yoshax/wahwahwah
Adds wah's custom item
2017-05-25 16:38:54 -04:00
Arokha Sieyes
7148034a0f Merge pull request #1547 from Yoshax/rigshit
Does a real big critical fix or something with hardsuits
2017-05-25 16:26:36 -04:00
Arokha Sieyes
17f1bedc29 Merge pull request #1546 from VOREStation/aro-emtsuit
Rework the Rescue Hardsuit
2017-05-25 16:26:00 -04:00
Yoshax
cdc36ed4f2 Closes a span 2017-05-25 19:18:13 +01:00
Yoshax
3fb4ac2cdf Adds wah's custom item 2017-05-25 18:20:54 +01:00
Yoshax
5b95b08c44 Ensures rigsuit pieces are protected from Phoron when deployed 2017-05-25 15:42:15 +01:00
Spades
b88675bb82 Closed the span 2017-05-25 00:26:19 -04:00
Arokha Sieyes
054d580e84 Rework the Rescue Hardsuit
Module 1: Maneuvering Jets - Jetpack, fwoosh.
Module 2: Sprinter - Gotta go fast!
Module 3: PATS Module - Opens doors you have access to 3 steps ahead of you, and has an (expensive) option to override an airlock you're facing, though this notifies command and sec of you doing this over radio.
Module 4: Micro Pharmacy - Contains 10u inaprovaline, tricordrazine, tramadol, and dexplus, each, and can have regeneration enabled to slowly regenerate these four drugs in exchange for energy.

(Also fixed a thing with the resleeving computer and disk while I was in there)
2017-05-24 21:10:16 -04:00
Leshana
ae270c6938 Adjusts random events to be more suitable for the Tether
Fixes #1542  Fixes #1396
* Disables the Supply Demand event until it can be reworked to be more interesting.
* Removes volatile fuel from the possible gases leaked in Atmos Leak event.
* Excludes areas around spawn points from the Atmos Leak event.
* Prevents gravity failure from disabling gravity on planetary z levels.
2017-05-24 17:08:39 -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
Leshana
5b840b1591 Runtime in living_vr.dm,197: Cannot read null.prefs_vr 2017-05-23 21:04:27 -04:00
Jakksergal
e113b6890b Applies ROT2 encyption to one letter. 2017-05-23 16:32:40 -07:00
Arokha Sieyes
01431cba31 PAT Module Basics 2017-05-23 19:19:14 -04:00
Jakksergal
277bbbeb5a Adds a " 2017-05-23 16:14:55 -07:00
Jakksergal
23c9c988e6 Tail Sprite Additions.
Adds a winged varient of both avian tails.
Adds a wingless varient of the bee 'thorax'
2017-05-23 16:03:29 -07:00
Leshana
497f2cc2d3 Fixes Runtime in 04_resleeving.dm,32: Cannot read null.ckey
proc name: copy to mob (/datum/category_item/player_setup_item/vore/resleeve/copy_to_mob)
And fixes Runtime in infocore.dm,175: code/modules/resleeving/infocore.dm:175:Assertion Failed: !deleted(M)
   proc name: init from mob (/datum/transhuman/body_record/proc/init_from_mob)
2017-05-23 01:14:56 -04:00
Leshana
c3df48f949 Fixes Runtime in atmosphere_alarm.dm,24: list index out of bounds
proc name: on alarm change (/datum/alarm_handler/atmosphere/on_alarm_change)
2017-05-23 01:14:55 -04:00
Leshana
4197a6e60d Fixes Runtime in preferences_setup.dm,230: Cannot read null.title
proc name: dress preview mob (/datum/preferences/proc/dress_preview_mob)
2017-05-23 01:14:55 -04: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
Arokha Sieyes
de9bcdcbe4 Merge pull request #1520 from VOREStation/vplk-multiz-computers
Switch nanomap computers over to using get_sensor_levels()
2017-05-21 22:20:21 -04:00
Leshana
93495bd53e 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.
* Overrode it for tether to let crew monitoring computers monitor the whole station.
2017-05-21 22:03:18 -04:00