Commit Graph

5986 Commits

Author SHA1 Message Date
Anewbe
050aa30eb1 Merge pull request #2817 from MagmaRam/defib_fix_please_make_this_the_last_one_please_god
Defibs should revive people now.
2016-11-24 13:26:03 -06:00
MagmaRam
eef853393e Defibs should revive people now.
This might be an unnecessary fix, I might just have the worst luck.
But I couldn't get a defib to res in 10 tries before this,
got it on the second after.
2016-11-24 00:30:05 -06:00
Anewbe
e8e0ab8762 Fixes two items not spawning properly, moves CE welder to locker 2016-11-23 16:13:55 -06:00
Anewbe
ea28bc8a44 Merge pull request #2804 from Nerezza/inflatablechanges
Inflatable QoL tweaks
2016-11-22 23:26:54 -06:00
Anewbe
f6d311093a Merge pull request #2807 from MagmaRam/door_tape
Tape can't be put on doors infinitely.
2016-11-22 21:57:11 -06:00
MagmaRam
14a68d6dcd Tape can't be put on doors infinitely. 2016-11-22 21:36:05 -06:00
Nerezza
d522f6d931 Inflatable QoL tweaks
Features:
- Ctrl-click can deflate inflatables now.
- Using inflatables on adjacent tiles deploys them to that tile. Currently this doesn't care about objects in the way, ie computers or welding tanks, but it does respect glass and imo it works fine this way.

Bugfix:
- Bumping an inflatable door no longer freezes it closed for a few moments.
2016-11-22 01:13:29 -06:00
Anewbe
07b5b6fc1c Defibs should actually work now 2016-11-21 19:18:05 -06:00
Anewbe
be7ca7f87d Merge pull request #2795 from Woodratt/1.6.2_Maptweaks_and_adds
1.6.2. Map Tweaks Random Loot lists yet another Armory Overhaul.
2016-11-21 17:58:20 -06:00
woodratt
a3fc7dad15 1.6.2. Map Tweaks Random Loot lists yet another Armory Overhaul.
- Taken from Bay and edited a bit, maintenance now has a chance to have some randomized items in crates and on racks. Nothing extremely exciting or game changing should spawn yet, sadly. Probably still needs some adjustments and really needs some additions but works at this stage for live testing to see how badly RNG wants to spawn sin pockets and botany gloves.
- Minor map adjustments to both z-levels 1 and 2. Including things such as a mirror placed on the technomancer ship. Light adjustments on the main z-level. Removing redundant lightswitches, adding lightswitches, removing redundant newscasters. Fixing other old mapping errors.
- Largest chunk of change, rework of the armory. Image Link Two sets of all of the armor except for the riot armor has been removed from the armory. A 'tactical equipment' storage room has been readded (warden access) with the combat armor, lethal ammo, and two of both the energy weapons and ballistic guns moved to it. Four energy weapon power cells have also been added to said equipment room as well as one magazine of lethal 45 ammo (it was 5 magazines before, this makes it a even and less OCD annoying 6, like the rubber magazines).
- Practice ammo moved from the armory to the firing range on a conveniently empty table.
- Defib units now available in medical, and one in both first aid checkpoints.
2016-11-21 14:41:13 -08:00
MagmaRam
a3fb16fa76 Merge pull request #2785 from Nerezza/doortweaks
Misc windoor fixes. Dron (and borgs) can now rename airlock/windoor assemblies.
2016-11-21 12:35:43 -06:00
Techhead
e679590204 Allows breaking tape with any object.
The previous system was arbitrary, considering you can use your bare hands.
Resolves #14642
2016-11-21 00:07:35 +00:00
Nerezza
867e1cee13 Updates for Yosh's work
Robot/dron tesnsions escalated!
2016-11-20 16:56:12 -06:00
Nerezza
95dc6af3ad Merged master into doortweaks 2016-11-20 16:51:56 -06:00
Nerezza
812d1b1df4 Filters the lesser borgs
You now have to be a greater borg (or the god-emperor of borgs) to rename airlock assemblies.
2016-11-20 16:47:52 -06:00
Anewbe
e2406123e9 Merge pull request #2788 from Yoshax/welder
Fixes up and implements the experimental welding tool
2016-11-20 15:22:11 -06:00
Yoshax
55c0fc86a3 Fixes up and implements the experimental welding tool 2016-11-20 18:59:06 +00:00
Yoshax
2c6d023fc7 Changes an attack_ai to attack_robot 2016-11-20 18:04:09 +00:00
Nerezza
df5906dc6b Misc windoor/airlock fixes
This started as me making robots able to rename windoors and turned into something a little more.
2016-11-19 21:43:46 -06:00
Yoshax
98c1bcb614 Allows borgs to use toggle lock on closets/crates 2016-11-20 01:39:50 +00:00
Nerezza
7b9be8c922 Gives cyborgs the ability to unbuckle things.
Checks if what they're attacking 'bare-handed' is adjacent to the cyborg, and has something buckled to it. If not, it passes the click on to AI click like usual.
2016-11-18 14:49:57 -06:00
MagmaRam
20b6d4be57 Merge pull request #2718 from Anewbe/teargas
Adds teargas grenades, currently aspawn only
2016-11-15 20:05:35 -06:00
MagmaRam
ac81408cf9 Merge pull request #2724 from Anewbe/signing
Ports sign language
2016-11-14 14:51:48 -06:00
Anewbe
8e5f9444f7 Fixes the autopsy scanner bugging on print 2016-11-14 14:14:25 -06:00
Arokha Sieyes
6022963815 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into defib
# Conflicts:
#	icons/obj/device.dmi
2016-11-12 14:55:16 -05:00
Anewbe
62c973f631 Merge pull request #2729 from Yoshax/uplinks
Resolves mercs not spawning with an uplink
2016-11-12 13:40:41 -06:00
Yoshax
418ea1b0ba Resolves mercs not spawning with an uplink 2016-11-12 18:13:45 +00:00
Anewbe
3a33b6221d More thing fixes 2016-11-12 12:01:44 -06:00
Anewbe
5e9b885b43 Actually fixes the stuff 2016-11-12 11:29:23 -06:00
Arokha Sieyes
f3b155b6f3 Switch << to 'to_chat' 2016-11-12 10:35:02 -05:00
Arokha Sieyes
2ea72d692f Drag to apply, reduced to 2 charges
More balanced maybe? More like 'rounding problems' dividing 1000 by 3 and having it work right.
2016-11-11 22:59:31 -05:00
Anewbe
d453a8dc5b Fixes the Sign over Radio bug 2016-11-11 19:58:46 -06:00
Anewbe
da90b87802 Ports Bay's tape recorders 2016-11-11 00:10:55 -06:00
Arokha Sieyes
f1eed186d3 Change to 'normal' cell
Per staff request
2016-11-11 00:48:46 -05:00
Arokha Sieyes
5c45086406 Change Adjacent() to get_dist() 2016-11-11 00:35:27 -05:00
Arokha Sieyes
91b61945cc Adds defibrilator kit
Adds a defib kit. Not ported from /tg/, not a backpack or anything. It's more like an AED than anything. Click with empty hand or drag onto yourself to take the pads out, and put them into some dead person's uniform slot.

Currently has 3 attempts with 75% chance of success with the default battery.

The paddles are cabled, so if you walk away with them it yanks the cable out and you have to reconnect them. Patient can't be moving either, and it won't shock living people (someone can code an emag thing for that I guess?).

(Excludes .dme addition)
2016-11-11 00:35:20 -05:00
Anewbe
2352001cfb Adds teargas grenades, currently aspawn only 2016-11-10 22:53:59 -06:00
MagmaRam
660b22101b Fix for health analyzers only showing multiples of 100% for health. 2016-11-06 16:55:49 -06:00
PsiOmegaDelta
65b12a10f2 Adds subtype friendly method to populate crates. 2016-10-25 21:40:28 +01:00
Neerti
7dadc5f6f9 Merge pull request #2658 from Anewbe/waistcoat
Waistcoats are accessories
2016-10-24 19:33:12 -04:00
Neerti
09030f8e8f Merge pull request #2673 from Anewbe/cuff_port
Kills Telecuffs
2016-10-24 19:28:44 -04:00
Yoshax
8c68671b3b Resolves an uplink issue 2016-10-24 23:11:55 +01:00
Anewbe
6d1d18a585 Kills telecuffs 2016-10-23 21:31:12 -05:00
Anewbe
b523406b27 Returns some functionality to the waistcoat, adds cham tie 2016-10-23 00:31:06 -05:00
Anewbe
510cf17723 Waistcoats are accessories 2016-10-19 22:29:22 -05:00
Anewbe
fa53b659a4 Should fix the tape thing. 2016-10-17 16:52:20 -05:00
Neerti
96767a6d05 Merge pull request #2647 from Anewbe/flashlight_device_cells
Flashlights use device cells
2016-10-16 17:34:54 -04:00
Neerti
561e2709dd Merge pull request #2622 from Anewbe/actual_embed_changes
Changes the way embedding works
2016-10-16 17:27:52 -04:00
Anewbe
44ac6b1b58 Tape rolls need to get a grip 2016-10-16 15:29:48 -05:00
Anewbe
bea401be2d Fixes device cells 2016-10-16 13:42:16 -05:00