Commit Graph

5675 Commits

Author SHA1 Message Date
Anewbe
0221b9bb9d Changes some fluffy bits to be more accurate 2016-05-21 18:00:54 -05:00
Datraen
dd4483d055 Merge pull request #1710 from Yoshax/fitnessvendor
Adds a new vending machine that vends fitness related products
2016-05-21 12:11:29 -04:00
Yoshax
0a6d1aa08d Makes detective belts hold detective guns 2016-05-21 15:21:07 +01:00
Yoshax
6142af14d2 Adds a new vending machine that vends fitness related products 2016-05-20 22:04:00 +01:00
Datraen
4772dc6b10 Merge pull request #1703 from Yoshax/bugfixes
Bug Fix Boogalo
2016-05-19 18:18:00 -04:00
Yoshax
b6efd91e92 Fixes #1163 2016-05-19 22:30:31 +01:00
Datraen
861dc04e89 Merge pull request #1699 from SinTwo/communicator_fix
Fixes Note Keeper and Empty Message
2016-05-19 15:40:36 -04:00
Datraen
ec3e4a0315 Merge pull request #1698 from VOREStation/bored,_fix_polaris
Fixes two high-priority issues
2016-05-19 14:29:46 -04:00
SinTwo
a39d2c5cc6 Fixes Note Keeper and empty message sending null 2016-05-19 14:17:12 -04:00
Arokha Sieyes
79684a3488 Fixes #1636
Donut boxes only held 6 because they had 6 stuffed into them by New(). The empty ones didn't have that. This manually sets the size to hold 6 donuts.
2016-05-19 11:36:18 -04:00
Datraen
2a6e86f4fc Merge pull request #1578 from SinTwo/clothes
Skirt addition and loadout refactor
2016-05-19 09:00:41 -04:00
Arokha Sieyes
5f4bde83b2 Makes plastique better
It destroys the wall it's placed on, rather than slightly somewhat dismantling it a little and requiring you to have a toolbelt to finish the job.
2016-05-18 18:24:10 -04:00
SinTwo
3ed17ad1ec Back to /rank/ 2016-05-18 15:08:18 -04:00
SinTwo
47176f4912 Communicator Texting And UI Overhaul (#1670)
* Communicators ui moved to FakeNanoUI

* Removed test file.

* Back to NanoUI

* NanoUI

* Communicator Texting and UI overhaul.

* Comment Fixes
2016-05-18 09:29:07 -04:00
Arokha Sieyes
769cb0d32f Makes robolimbs repair completely
Previously, because noncritical robolimbs did not count for bruteloss or burnloss (per line 13 in human_damage.dm), nothing would ever cause robot limbs to call update_wounds() on the organs to clear wounds after repair. Furthermore, update_wounds ignored wounds on robotic limbs and edited early without even checking if it should remove them. This caused a problem.

This corrects this, and still exits early(er) in update_wounds() for robotic limbs, but makes sure there are no 0-damage wounds left and if there are, removes them.

As a 'backup', hitting a robolimb with a welder when there's nothing to fix will also call this proc, to catch any cases where someone has directly changed wounds or anything like that.

Also fixes spacing on robolimb damage examine text (get_wound_desc had spaces, but should not have in most cases), and added a message for having an open maintenance panel on a limb.
2016-05-18 01:25:34 -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
49a249af00 Multi-tile airlock building FIX 2016-05-16 18:31:32 +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
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
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
Datraen
835a719351 Merge pull request #1639 from Yoshax/clickcase
Adds click cooldown to display case
2016-05-12 21:59:13 -04:00
Yoshax
939073a0d2 Adds click cooldown to display case 2016-05-13 01:34:19 +01: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
Neerti
b65ed00b5f Merge pull request #1415 from Hubblenaut/reinf
Reinforced Walls
2016-05-11 01:52:46 -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
SinTwo
64df53f568 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into clothes
Conflicts:
	icons/mob/uniform.dmi
2016-05-06 21:03:18 -04:00
SinTwo
8f5dd213ed Merge branch 'master' of https://github.com/PolarisSS13/Polaris into clothes
Conflicts:
	icons/mob/uniform.dmi
	icons/obj/clothing/uniforms.dmi
2016-05-06 18:31:07 -04:00
redstryker
ff361c2023 Changes all references to 'Mars University' to 'Mojave University' 2016-05-06 18:23:40 -04:00
SinTwo
5e4ca22080 Adds skirts by JakkSergal, cleans up skirts, simplify skirts on loadout. 2016-05-06 18:17:19 -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
Yoshax
4d160c261d Revamps cargo supply code to allow for nicer code (#1508)
* Adds lunchboxes to dinnerware vendor and buffs the amount of ingredients the chef starts with

* Revamps cargo supply code to allow for multiple items to be ordered on one line and nukes the remaining multiple lined orders

Corrects a number mistake

Fixes some list formatting

Actually fixes list formatting

* Removes a stray comma
2016-05-04 17:20:22 -04: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
Yoshax
6072ad758a Removes a bunch of old, unused code 2016-05-02 14:13:50 +01:00
Yoshax
5824f0a7c1 Comments out smoke reducing laser damage until there's a nice way to do it 2016-05-02 13:44:47 +01:00