Commit Graph

3380 Commits

Author SHA1 Message Date
Arokha Sieyes
d7e65b22ba Merge branch 'master' of https://github.com/VOREStation/Polaris into sync 2016-05-16 18:31:38 -04:00
EmperorJon
0d61e9b47e Merge pull request #1667 from Yoshax/beltfix
Belts no longer drop when dragged to /obj/screen
2016-05-16 21:45:48 +01:00
EmperorJon
e740d42b79 Merge pull request #1664 from silveryferret/death_alarm_change
Changes Death Alarm
2016-05-16 21:43:34 +01:00
Yoshax
f059a542b0 Belts no longer drop when dragged to /obj/screen 2016-05-16 16:36:27 +01:00
silveryferret
540a1cd21f Changes Death Alarm
Changes the Death Alarms from announcing to general comms, to just
Security and Medical. Because sometimes hearing your best friend has
died over Common channel is not the best scenario to hear that someone's
died.

Used the captain's headset to keep things slightly cleaner, and it gets
deleted after as far as I can tell.
2016-05-15 22:42:54 -05:00
Yoshax
be6ab03d13 Fixes a problem with discount never being displayed correctly on uplinks 2016-05-16 01:14:25 +01:00
Yoshax
718b249b1d Uplink changes and additions (#1645)
* Splits uplink categories into separate files and moves other files around

* Corrects an incorrect description

* Puts uplink categories in uplink_categories into the same order as they are individual files

* Mercenaries now spawn with their own private uplink.

* Adds a random discount to uplink items that is applied every 15 minutes

no message

no message

* Adds changelog

* Fakes announcements are now once again purchasable from the uplink and actually work

* Removes a debug line

* Adds several existing items to the antag uplink including stun rounds for shotguns, metal foam grenades and more

* Refactors boxes.dm to use absolute pathing and for loops for contents

Adds changelog
2016-05-15 18:31:34 -04:00
Arokha Sieyes
f8fe9994e5 Merge branch 'master' of https://github.com/VOREStation/Polaris into polaris-update
# Conflicts:
#	code/world.dm
#	config/example/config.txt

Resolved by removing old lines.
2016-05-15 12:39:30 -04:00
Hubblenaut
f09df76e4a Hacktool (#1607)
* Adds hacking tool.

In normal mode a hacking tool acts and functions just like any multitool. Use a screwdriver to toggle between normal and hacking mode.
Hacking attempts will take 20 +(0 to 20) seconds (triangular distribution, averages at +10 seconds).
Once an airlock has been successfully hacked the user will have full access to the door operation interface normally restricted to silicons.

A hacking tool will remember the last 6 to 8 hacked airlocks.  No time is needed to again hack remembered airlocks.
Once the limit has been reached the least recently accessed airlock is forgotten. Hacking a remembered airlock will update the last accessed time.

Also adds a basic observer/listener pattern implementation to, for example, make it easier to catch when objects have been destroyed and clear references.

* Corrects and adds more sanity checking.

* Adds hacktool to uplink devices
2016-05-15 09:38:10 -04:00
Arokha Sieyes
1c77dda552 Adds centcom jobs, headset, PDA, as-of-yet unused hud_vr soon-to-be-used 2016-05-14 18:02:36 -04:00
Datraen
25827b3b14 Merge pull request #1581 from Neerti/5/6/2016_pda_multicaster
Adds PDA Multicaster
2016-05-13 00:37:18 -04:00
Datraen
15d504eb4e Merge pull request #1626 from Yoshax/weaponupdate
Weapon sharpness and edge adjustments
2016-05-12 22:00:06 -04:00
Arokha Sieyes
17a64bebea Merge branch 'master' of https://github.com/PolarisSS13/Polaris into breakfix
# Conflicts:
#	code/modules/mob/living/carbon/human/update_icons.dm
#	code/modules/mob/new_player/new_player.dm
#	vorestation.dme
2016-05-12 13:02:51 -04:00
Yoshax
7fe2150d3f Removes a stray character 2016-05-12 16:36:09 +01:00
HarpyEagle
d3aacce795 Animation and cooldown only come into effect if the flash is actually used 2016-05-12 16:31:07 +01:00
HarpyEagle
8079b34a27 Updates flashbangs and flash/flare rounds to take advantage of new lighting.
Main improvement is somewhat brighter flashes, coloured flares.
2016-05-12 16:21:39 +01:00
Yoshax
e2c66a3bf2 Weapon sharpness and edge adjustments 2016-05-12 16:13:41 +01:00
Neerti
4656db4aa9 Adds PDA Multicaster
Adds a new machine to telecomms, which contains special PDAs corresponding to each department on the station.  Sending a PDA message to one of these PDAs will duplicate it to everyone in the department the PDA is assigned to.  It determines what department someone is in by cartridge type.
Adds cartridges for several jobs that were missing them, for the purposes of being recognized as being in a department.  The cartridges otherwise do nothing.
New circuitboard to build the new pda multicaster.  It can also be deconstructed with the standard machinery deconstruction steps of screwdriver > crowbar.
2016-05-12 02:50:35 -04:00
Neerti
cb08c07cf2 Merge pull request #1602 from redstryker/master
Adds Glowsticks
2016-05-11 02:00:51 -04:00
Neerti
861c9d7fdc Merge pull request #1560 from Yoshax/emagupgrade
Adds the ability to feed telecrystals to emags for more uses
2016-05-11 01:55:12 -04:00
Neerti
84d389a0c7 Merge pull request #1479 from Yoshax/limbfixes
Wound Changes + Fixes + Medical Changes
2016-05-11 01:53:58 -04:00
redstryker
8b5ed3d7ff Adds Glowsticks 2016-05-08 18:22:15 -04:00
Yoshax
79b1bf5260 Removes antag limitations on uplink items to make them actually buyable 2016-05-08 22:03:17 +01:00
Cameron653
28b6d34e96 Adds doghounds. WIP 2016-05-08 12:19:03 -04:00
redstryker
ff361c2023 Changes all references to 'Mars University' to 'Mojave University' 2016-05-06 18:23:40 -04:00
Yoshax
47508187cc Makes smoke grenades last longer and adjusts checks
- Changes boxes of smokes from 5 to 7 grenades
- Changes mapped in single smoke grenades to boxes
2016-05-06 17:25:28 +01:00
Yoshax
0abb642a60 Adds the ability to feed telecrystals to emags for more uses 2016-05-05 19:59:36 +01:00
Datraen
beda3185eb Reverts the second mob clean up because of incomplete implementation.
This caused an error that would then cause machinery to hang on the server, and was reproduced successfully.
2016-05-04 00:24:55 -04:00
SinTwo
5ae20ceb8b Buildables v1.2 (#1517)
* Removes text2path, adds constructability to a few things, adds a locker_painter.dm, and several fixes.

* Fixes Maps due to working on ancient versions.

* Path error.

* Adds a missing ..()
2016-05-03 22:18:12 +01:00
EmperorJon
f62eacf6e5 Merge pull request #1519 from Yoshax/smokegrenades
Smoke grenade changes and adjustment
2016-05-02 18:04:23 +01:00
Datraen
3baf91b46e Merge pull request #1307 from Neerti/3/30/2016_dumb_gun_balance
Dumb Gun Balance Patch
2016-05-01 17:42:25 -04:00
Yoshax
1e78ff97e1 Adjust smoke color selection 2016-04-30 14:29:46 +01:00
Anewbe
7b1eb6c099 Refactors specialized satchels as children of the regular (leather) satchel 2016-04-29 18:44:28 -05:00
Yoshax
c4929aa43f Adds ability to change color of smoke of smoke grenades with a multitool 2016-04-29 20:30:31 +01:00
Yoshax
b57ea6a752 Adds colored smoke grenades and ability for them to take color 2016-04-29 17:19:08 +01:00
Datraen
45f97f2a45 Merge pull request #1491 from Hubblenaut/morgue
Morgue Trays interface with occupant minds
2016-04-27 20:49:15 -04:00
Neerti
73c723c8d4 Merge pull request #1469 from Nerezza/DefaultCoolerCell
Upgrades default suit cooler cell
2016-04-25 14:36:48 -04:00
Hubblenaut
c61053d432 Morgue Trays interface with occupant minds 2016-04-25 20:10:43 +02:00
Chinsky
e12e9300fa Adds new type of wounds - piercing.
Unlike cuts they do not merge, so many small-damage stabs will create many small stab wounds instead of one megahole.
Also cleans up checks in wound code a bit with power of OOP
2016-04-22 19:00:17 +01:00
Yoshax
2c27ad3494 Doubles medical stack amount to balance stack amount 2016-04-22 18:58:54 +01:00
Hubblenaut
c9df1c6985 Bruise packs are used per wound and take time to apply 2016-04-22 18:46:41 +01:00
Neerti
554adc1743 Merge pull request #1467 from Nerezza/ParaDuffels
Adds EMT Duffelbags
2016-04-21 21:08:19 -04:00
Neerti
114a3e38bc Merge pull request #1463 from Yoshax/storagefixes
Normalises medical item storage size + fixes
2016-04-21 21:07:34 -04:00
Nerezza
4618c49793 Upgrades default suit cooler cell
Considering suit coolers are dedicated EVA equipment instead of emergency equipment, it's strange that they come equipped with a cell that lasts a handful of minutes in operation instead of a duration more comparable to an oxygen tank's.

This upgrades their default cell so that FBPs can grab, combine, and go just like other crewmembers.
2016-04-21 18:25:44 -05:00
Nerezza
24cd704115 Adds EMT Duffelbags
Sprites EMT variation of medical duffels and places them into the bottom of their locker.
2016-04-21 16:37:43 -05:00
Yoshax
0a249df22e Normalises medical item storage size + fixes
Makes all first aid kits the same size,
Fixes pill bottles not holding 14 pills,
Fixes antag surigcal kit not holding all the items.

Adds a max weight class of 1 to pill bottles

Properly adjusts antag surgical kit size
2016-04-21 16:15:45 +01:00
Kelenius
98badae45f Merge branch 'master' into cleanupTwo 2016-04-21 11:41:32 +03:00
Neerti
3c92193bf5 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 3/30/2016_dumb_gun_balance
# Conflicts resolved:
#	code/modules/projectiles/projectile/beams.dm
2016-04-20 05:41:36 -04:00
Neerti
69a4242b17 Inventory Tweaks 1
Evidence bags should no longer start empty.
Reduces maximum width for the inventory background slightly.
Makes a new, slimmer to close the inventory.  This and the maximum width reduction mean the inventory should never overlap with other UI buttons.
2016-04-16 10:28:14 -04:00
EmperorJon
482316ed55 Merge pull request #1368 from Neerti/4/6/2016_new_inventory_port
Ports Bay's new inventory system.
2016-04-16 02:58:07 +01:00