Commit Graph

2209 Commits

Author SHA1 Message Date
HarpyEagle
36e53d4b98 Fixes disarm-attacking being very likely to break the limb before dislocating it.
Also makes it possible to 'strike to cripple' with stunbatons
2016-06-19 23:58:16 +01:00
Richard D'angelo
7ab5220f64 510 Improved Overlays
Fixes auto blindness and no click on 510 servers, lessens the lag of
mesons and material scanners, and I suspect the general speed as well.

I only made it work for Polaris (and by extention, to our server, Eros),
and adapted it a bit.

Ported from:

7c2cc890ab
2016-06-18 15:50:10 -03:00
HarpyEagle
58b87f1a4b Adds do_surgery() behaviour for various items
Heath scanners, autopsy scanners, syringes, hyposprays, droppers and bottles.
2016-06-17 19:06:56 +01:00
Mark9013100
c0414d2917 Allows cards to go on the ear slot 2016-06-14 12:17:35 -04:00
Yoshax
fdc8b33b2c Adds towels to fitness vendor, color is randomised 2016-06-13 20:19:52 +01:00
Datraen
299059a5be Merge pull request #1883 from Yoshax/drinks
Ports GinjaNinja32's drinks rewrite from Bay
2016-06-10 23:08:41 -04:00
Arokha Sieyes
08972b1dc5 Better, now. 2016-06-09 18:28:16 -04:00
Arokha Sieyes
74a1b59a39 Adds IDs and Wallets
Adds variants of ID cards for each department and head, and adds several new colors of wallet. The wallets self-color the little ID in the corner based on the ID inserted so they always show the right picture of the ID, without needing to sprite each ID. Some are snowflaked, notably Gold and Centcom, but the rest are generated on the fly based on colors on the ID.
2016-06-08 19:29:47 -04:00
Neerti
fa5dd08f2f Merge pull request #1893 from Yoshax/spears
Spear fix + a change
2016-06-08 01:14:05 -04:00
Yoshax
d076962c51 Spear fix + a change 2016-06-08 03:54:44 +01:00
Kearel
d21841a92e Lets spears be made from butterfly knifes as well as shards. 2016-06-07 19:42:11 +01:00
GinjaNinja32
debfd3dabf Ports GinjaNinja32's drinks rewrite from Bay 2016-06-06 20:33:11 +01:00
Datraen
fbb0f764d2 Adds a missing (src) 2016-06-02 18:12:21 -04:00
Yoshax
f75d509e7f Ports event system from Bay 2016-06-01 22:05:04 +01:00
Yoshax
0777379d37 Fixes box of EMP grenades only ever spawning 1 grenade 2016-06-01 02:00:57 +01:00
Arokha Sieyes
05f8a69821 Make FBPs Constructable
Print 'em out, slap an MMI or Posibrain in. They come from a new machine, the Prosthetics Fabricator. You can order license discs from cargo to print the proprietary limbs. Making FBPs requires a bit of research as well, otherwise you only get arms/legs. Also requires a bit of plasteel to make the critical parts. Mostly just need every limb, plus eyes. Torso comes with the snowflakey FBP battery.

Also adds an FBP 'self-diagnostics' verb. More vague than an analyzer.

**This adds a machine that needs to be placed on the map. "/obj/machinery/pros_fabricator"**

Personally, I would replace the right-side exosuit fab with it. I can add this to my PR but I'm unsure how you guys feel about non-devs submitting map changes.
2016-05-30 02:13:55 -04:00
Yoshax
df0135ac2b Merge branch 'master' of https://github.com/PolarisSS13/Polaris into attackcall 2016-05-29 01:00:50 +01:00
Mark9013100
71075c600e Renames the classic EMP grenade 2016-05-28 17:12:43 -04:00
EmperorJon
01b3182004 Merge pull request #1462 from Datraen/Xenobiology_2
Xenobio2
2016-05-28 21:32:18 +01:00
Yoshax
cd9fdd228b Merge branch 'master' of https://github.com/PolarisSS13/Polaris into attackcall 2016-05-28 20:22:09 +01:00
Neerti
cbd4915420 Merge pull request #1592 from Anewbe/borg_changes
Various Borg Changes
2016-05-28 12:44:27 -04:00
Arokha Sieyes
ea6754597e Ports Bay's Robolimb Changes (#1779)
* Consolidates copypasta for repairing robolimbs

Also prevents self-repairing a limb you are using to hold the tool

* Fixes robot organs becoming undamagable after reaching cap

* Fixes repairing with cable not using any cable, repairing with weldingtool not doing eyecheck

* Removes ORGAN_ROBOT and ORGAN_ASSISTED flags, fixes #13123

* Fixes damage to robotic limbs not triggering organ processing

At the same time, robotic limbs with damage don't need to process.
However, it's much safer to explicitly have robot limbs return 0 from
needs_process() instead of not rechecking bad external organs.

* Build on HarpyEagle changes to apply to Polaris

Had to apply the change from flag to an enumeration.

* Removes unneeded file

* Fix bruisepacks, remove heart

Well, the unused bay version of the heart anyway

* Tweaks examine, reverts isSynthetic

Reverted that because Bay doesn't use it the same way. Also changed Examine to not list every robo-limb on non-FBPs in red, but left them listed as normal per Spookerton
2016-05-28 14:12:19 +01:00
Yoshax
cbe932d1ed Merge pull request #1746 from VOREStation/constructions
Fixes Exosuit Fabricator Deconstruction and makes Jukeboxes constructable
2016-05-27 14:41:46 +01:00
Datraen
ed5baa120e Merge pull request #1750 from Yoshax/towelfix
Fixes towel hit sound
2016-05-26 15:44:28 -04:00
PsiOmegaDelta
92b97e1d2d Mapped tape rolls can now apply themselves.
Can be applied to anything as long as it's airlocks. Ensures proper layering, icon state, etc. Fixes #13058
2016-05-26 17:53:00 +01:00
Yoshax
5ad5206db3 Fixes towel hit sound 2016-05-26 16:48:25 +01:00
Datraen
4448a6f469 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into Slime_Rework_3
# Conflicts:
#	code/modules/mob/living/say.dm
2016-05-26 08:20:41 -04:00
Leshana
e37ac4da3e Fixes #145 - Makes jukeboxes constructable.
* Adds circuit board.
* Adds design to print board on autolathe.
* Makes jukeboxes deconstructable back to frame.
2016-05-25 21:35:24 -04:00
Datraen
3b72b362d7 Fixes #530 2016-05-25 17:11:36 -04:00
Datraen
349251e55f Merge branch 'master' of https://github.com/PolarisSS13/Polaris into Slime_Rework_3
# Conflicts:
#	icons/mob/items/lefthand.dmi
#	icons/mob/items/righthand.dmi
#	icons/obj/weapons.dmi
2016-05-25 15:09:23 -04:00
Yoshax
9b8aefed5b Adds towels 2016-05-25 18:38:16 +01:00
Anewbe
d2b43bd5a4 Prevents the Robocalypse 2016-05-22 14:51:35 -05:00
Yoshax
0a6d1aa08d Makes detective belts hold detective guns 2016-05-21 15:21:07 +01:00
Datraen
a797f2007a Merge branch 'master' of https://github.com/PolarisSS13/Polaris into Slime_Rework_3 2016-05-20 22:39:33 -04:00
Datraen
bb7713b2a8 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into Slime_Rework_3
# Conflicts:
#	code/game/objects/items/devices/multitool.dm
2016-05-19 17:31:25 -04:00
Yoshax
b6efd91e92 Fixes #1163 2016-05-19 22:30:31 +01: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
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
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
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
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
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
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
3a666dbd7f Fixes certain compile errors with the taser, baton.
Simple code certainly needs testing, regardless of the hour.
2016-05-12 18:38:41 -04:00
Yoshax
7fe2150d3f Removes a stray character 2016-05-12 16:36:09 +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