Commit Graph

4372 Commits

Author SHA1 Message Date
Cheridan
f68584078c Merge pull request #15916 from Menshin/gc_destroyed2qdeleted
Replaced last occurences of gc_destroyed by qdeleted()
2016-03-06 12:29:30 -06:00
Tkdrg
9633cae728 Fixes camera runtime 2016-03-05 08:51:48 -03:00
Menshin
9afe050025 Replaced last occurences of gc_destroyed by qdeleted(). 2016-03-05 01:58:56 +01:00
tkdrg
e0b4569165 Merge pull request #15895 from TehZombehz/firstfashion
Adds green version of the plaid skirt.
2016-03-04 21:34:42 -03:00
c0
a690abcf92 Plant Refactor: Seeds 2016-03-04 02:35:51 +03:00
TehZombehz
b4c165655d My first attempt at a commit. Adds a green version of the plaid skirt to the clothesmate. It's just a recolor. 2016-03-02 23:42:58 -06:00
tkdrg
c02ccab8c0 Merge pull request #15758 from AnturK/spawners
Refactor of map and corpse spawners.
2016-02-29 23:44:38 -03:00
AnturK
59774fc0fb Fixes some other ghost interaction issues. 2016-02-26 23:13:13 +01:00
tkdrg
45fca87806 Merge pull request #15687 from AnturK/template_improvements
Template loading improvements
2016-02-25 16:29:10 -03:00
AnturK
5edc60ed0a Unifies corpse spawners 2016-02-25 18:36:16 +01:00
Cheridan
26731ee94e Merge pull request #15519 from PKPenguin321/sharpened-bikehorn
Adds sharpening blocks
2016-02-24 19:49:40 -06:00
AnturK
2dca4811b6 Merge pull request #15686 from Menshin/bot_patrol_fixes
Bots patrol/summons tweaks and fixes
2016-02-24 14:11:09 +01:00
phil235
57203430fd Merge branch 'master' of https://github.com/tgstation/-tg-station into ActionButtonUpdateRefactor
Conflicts:
	code/modules/clothing/clothing.dm
	code/modules/mob/living/carbon/inventory.dm
	code/modules/mob/living/carbon/life.dm
	icons/mob/actions.dmi
2016-02-23 19:49:38 +01:00
phil235
0ec876d9fe Refactored the item's action system. Items can now hold multiple actions.
The "set internals" button of tank items now turn green when it's used as internals.
Removed research scanner from drones (since cyborgs don't have it, it's more consistent)
Removed the ignore_madkadjust mask var.
The sechailer mask now has an adjust mask action button, so I removed the adjust verb that it was using.
The item's action are now created on item/New() instead of trying to create it every time someone picks the item up.
I split hud/action.dm, the datum/action stuff is now in the datum folder (/datum/action.dm), whereas the code for action buttons is kept in the hud folder under action_button.dm. Also I moved some /datum/action code that was in some files back into datum/action.dm where it belongs.
2016-02-23 19:37:42 +01:00
AnturK
b56aefae74 Makes burglar alerts activate poddoors.
Adds generic lock/unlock helpers to /door
2016-02-22 19:08:43 +01:00
Menshin
5533b54a0e * Cleaned bot patrol/summon logic regarding pathing retries
* Splitted navbeacons global list in several z_level lists
* Fixes navbeacons and deliverybeacons global lists being erased when a navigation beacon was destroyed
2016-02-22 17:56:34 +01:00
Cheridan
09252b4f4b Merge pull request #15657 from KorPhaeron/abductor
Abductor Airlocks
2016-02-22 00:05:15 -06:00
KorPhaeron
3f439b211c Abductor Airlocks 2016-02-21 00:01:54 -06:00
AnturK
48e9fb731f Adds missing ..() in SSU New 2016-02-20 15:39:15 +01:00
Cheridan
cfcecba389 Merge pull request #15575 from phil235/ReviveFix1
Fixes mob revival
2016-02-17 20:42:10 -06:00
Cheridan
a66e40eb9a Merge pull request #15558 from Incoming5643/pisssh
Restores the old sound of windowed doors
2016-02-17 19:50:29 -06:00
xxalpha
7c0c66dba3 Merge remote-tracking branch 'upstream/master' into urange 2016-02-17 14:21:29 +00:00
AnturK
ea2f57e6d2 Merge pull request #15523 from optimumtact/extreme_makeover_turret_edition
Rearrange turret files to split out functionality
2016-02-17 11:34:02 +01:00
phil235
5db3ab47c7 Merge branch 'master' of https://github.com/tgstation/-tg-station into ReviveFix1
Conflicts:
	code/game/machinery/computer/aifixer.dm
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/silicon/ai/ai.dm
	code/modules/mob/living/silicon/robot/robot.dm
2016-02-17 00:33:26 +01:00
phil235
7e1efca13a Created two new procs to handle reviving mobs more easily:
- can_be_revived(), used so we don't revive a mob who would immediately die again (lack of brain organ for carbons).
- fully_heal(), called by revive when we want to completely heal a mob before trying to ressuscitate it.

I gave some arguments to revive() so the proc can be used by more than just the admin healing code (ai revived by the AI fixer console, drone revived by another drone clicking it, strange reagent ressuscitating you, borg revived by restart circuitboard, changeling using his revive ability, etc)

This fixes borg revival not updating its vision correctly and not updating the diagnostic HUD. Same fix for changeling revival.
2016-02-16 23:27:08 +01:00
Cheridan
aa8de1bb51 Merge pull request #15554 from Menshin/autolathe_stacks_fix
Fix autolathe merging on top stacks without checking for types
2016-02-16 13:22:23 -06:00
AnturK
7ede85391f Merge pull request #15527 from phil235/ReviveFixes
Fixes blindness overlay after reviving.
2016-02-15 23:17:55 +01:00
Incoming
9e2f72bd8c Makes the vanilla white windowed doors (the fulltile ones) sound like other doors again as opposed to sounding like windoors (the tile boarder ones).
I'll take "Things everyone wanted to do but inexplicably didn't" for 400, Alex.
2016-02-15 17:01:12 -05:00
oranges
f2d4a60c74 Fix a lot of issues as pointed out by review
Update the defines to be the correct syntax
2016-02-16 10:50:38 +13:00
oranges
913d46f32d Remove old workaround check
This looks to be a check from before nodrop functionality to prevent robots using their gun on the turret
2016-02-16 10:05:32 +13:00
oranges
0dd89d484a Rearrange turret files to split out functionality
Add defines for the turret construction phases

Tweak syndicate turret targeting to remove uncessary faction check
2016-02-16 10:05:32 +13:00
Menshin
8b5ffe4779 Fix autolathe merging stacks without checking for types. 2016-02-15 20:44:28 +01:00
tkdrg
2a4a5a42f4 Merge pull request #15522 from optimumtact/unholyspawns
Refactor out a spawn in turret code
2016-02-15 16:39:49 -03:00
oranges
f5812bbd47 Refactor out a spawn in turret code
Also avoids checking the emagged var twice when shooting a projectile
2016-02-15 23:25:02 +13:00
tkdrg
f2fc954846 Merge pull request #15511 from francinum/patch-2
Normalized capitalization.
2016-02-14 23:14:16 -03:00
phil235
e3bbcb0f7f Fixes revive() not properly removing the blind overlay. (fixes staff of healing)
Fixes revive() working on brainless carbons, making them die right away. It now only heals the body but doesn't actually make the mob alive again.
Fixes dead mob put into closet and then revived not seeing the closet vision overlay.
Fixes brain mob's emp_damage never decreasing when stat == DEAD.
Fixes posibrain's brainmob starting dead.
Fixes ai fixing not clearing the blind overlay properly.
Fireball projectile no longer explodes on the firer when there's a body on their tile. The fireball's range() code now only checks the two tiles on its front left and front right for mobs to hit.
Remove some update_vision_overlays() (now unused) that I forgot to remove.
Using a staff oh healing on a corpse with a damaged brain organ will revive the mob and heal the brain organ.
2016-02-14 15:26:46 +01:00
francinum
854f0e3171 Fixes the rest in BuildAndRepair 2016-02-14 02:12:43 -05:00
oranges
1653df9e51 Make sure function is defined before overriding it 2016-02-14 19:43:52 +13:00
oranges
4058f268e1 Fix how AI turrets assess human perps
Now it matches how the old logic worked

Probably also takes care of how heavy turrets are at the moment.
2016-02-14 19:39:29 +13:00
PKPenguin321
8bb9680e1a adds sharpeners
two can be found in the kitchen vendor
2016-02-13 22:12:58 -08:00
francinum
09daed57b8 Normalized capitalization.
circuit Board (Exosuit Control Console)
circuit board (Exosuit Control Console)
2016-02-13 21:37:53 -05:00
tkdrg
704c00aafe Merge pull request #15479 from AnturK/lathe_fix
Fixes autolathe search
2016-02-13 22:11:22 -03:00
tkdrg
a144f70319 Merge pull request #15476 from phil235/ClonePodEjectFix
Fixes clonee in crit not falling down when ejected from the cloning pod.
2016-02-13 17:25:22 -03:00
tkdrg
b230117223 Merge pull request #15439 from Malkevin/implants2
Tracking Implants
2016-02-13 00:17:09 -03:00
tkdrg
fa287ee090 Merge pull request #15146 from Buggy123/patch-13
Adds cable coils to autolathe
2016-02-12 21:39:40 -03:00
AnturK
7f8dc6710f Fixes autolathe search 2016-02-13 00:55:58 +01:00
Buggy123
5788e89ffa Added cable coils to the autolathe
Cable coils will only be built in stacks of 30, at maximum.

Reduced cable coil cost to 1/4 to be more in line with other tool costs.

Reduced cable coil cost to 1/4 to be more in line with other tool costs.

Fixed it not compiling?

Finally got it to compile

Fixes bad code

removed unnecessary /var

Added maxstack var to define custom stack sizes for things

Allowed the autolathe to use custom stack sizes.

Adds correct maxstack values to various stackable objects
2016-02-12 18:17:34 -05:00
phil235
dab224ef2c Fixes clonee in crit not falling down when ejected from the cloning pod. 2016-02-12 22:31:07 +01:00
Malkevin
457b739e28 Merge branch 'master' of https://github.com/tgstation/-tg-station into implants
Conflicts:
	code/game/machinery/computer/prisoner.dm
	code/game/objects/items/weapons/implants/implant.dm
2016-02-11 23:41:57 +00:00
Malkevin
9ecaac979a Tracking implants
Removes the clunky unintuitive ID number system from tracking implants and replaces it to show the mob's name, as chemical implants already did, and the teleporter already did re: trackers
This is on both the Prisoner Management Console and the hand tracker thingamabob.

Also:
Added a line break on chemical implants on the prisoner management computer so the read out doesn't look like arse. (see here https://www.dropbox.com/s/nawkd06ztqkmkqe/Screenshot%202015-03-28%2015.16.06.png?dl=0)
Fixed the wrong path for weapons auth implants' descriptions
2016-02-11 23:20:46 +00:00