Commit Graph

170 Commits

Author SHA1 Message Date
c0
9fdbe269d6 More fixes 2016-06-13 12:43:25 +03:00
Razharas
4b7d83be77 Merge pull request #18375 from ChangelingRain/gearhud
Makes cyborg ratvar conversion work properly
2016-06-09 22:43:54 +03:00
Joan Lung
8d2da45e8c duh 2016-06-09 08:39:16 -04:00
Joan Lung
c5ee14a0e3 gotta emag the borg 2016-06-09 08:21:24 -04:00
Joan Lung
16fa622e56 this is all butts 2016-06-08 23:18:23 -04:00
Joan Lung
0765173ee2 hudupdate 2016-06-08 15:59:12 -04:00
Joan Lung
4f8133c3d1 unfucks ratvar conversion 2016-06-08 15:50:06 -04:00
GunHog
61b235d23c Merge remote-tracking branch 'remotes/upstream/master' into AshTreaders
# Conflicts:
#	code/modules/research/designs/mechfabricator_designs.dm
2016-06-07 18:37:38 -05:00
GunHog
ff90dda131 Mining Cyborg Ash Storm Plating Upgrade
Adds an upgrade to Mining Borgies which will make them immune to ash
storms while looking TOTALLY AWESOME.
2016-06-07 11:25:19 -05:00
GunHog
80065468d4 Hyper KA for mining borgies <3
- Mining Cyborgs may now be upgraded with Hyper-Kenetic Accelerators
- Same cost and reqs as human version.
2016-06-05 11:57:39 -05:00
MMMiracles
7c8603a0a8 important features (#18195) 2016-06-03 14:48:12 -05:00
LatD
d89eb178c6 Merge remote-tracking branch 'refs/remotes/tgstation/master' into Research 2016-05-30 18:33:55 +03:00
kevinz000
c88c964f26 Minor Tweaks for PK borgs + recharger (#17940)
Cyborg rechargers now recharge a minimum of 200/tick, up from a default setting of 20/tick
PK borg cookie dispensers now have a 1 second cooldown
PK borg hug shocks has a 2 second cooldown up from 1
Cyborg hyposprays now log
PK borg harm alarm emagged will no longer stun you if you have bowman headset
PK borgs are the only cyborgs that can hugshock and hugcrush (I added hugs for it, medborgs, and standard borgs
2016-05-30 10:52:52 +12:00
LatD
f36237a67d Merge remote-tracking branch 'refs/remotes/tgstation/master' into Research 2016-05-25 18:45:31 +03:00
Xhuis
382c58cf23 Maybe now? 2016-05-24 18:25:20 -04:00
LatD
907fc36e5c Merge remote-tracking branch 'refs/remotes/tgstation/master' into Research 2016-05-24 22:17:44 +03:00
LatD
16cd4fbaa0 Exosuitfab origin and req lvls 2016-05-23 22:54:49 +03:00
oranges
4dd328a9fa Merge pull request #17355 from kevinz000/KeepersOfThePeace
Peacekeeper Borgs
2016-05-23 12:32:06 +12:00
LatD
502249831d Syndicate origin tech changes 2016-05-18 20:12:01 +03:00
Xhuis
b93957e6ca Pre-testmerge polish 2016-05-15 13:15:27 -04:00
Xhuis
10f9e64666 Conflicts VII 2016-05-15 01:19:57 -04:00
Xhuis
23073619a2 Conflicts III 2016-05-15 00:59:44 -04:00
Xhuis
45ef8a5e00 Ratvar, the Clockwork Justiciar 2016-05-15 00:59:28 -04:00
kevinz000
95ca999d44 FixesGrammer+otherstuff 2016-05-13 23:31:38 -07:00
kevinz000
5f93cc5af1 NoMessageSpam
Harm Alarm no longer spams multiple lines of text!
2016-05-13 23:03:14 -07:00
kevinz000
85e88b3d6c stunarmnerf
Stun arms now have a cooldown of 3 seconds.
2016-05-13 22:54:25 -07:00
kevinz000
0940816bcc cooldowns 2016-05-13 16:47:39 -07:00
kevinz000
f19544b08f hugshockshonkhonk 2016-05-13 16:45:01 -07:00
kevinz000
a4961f2e4d Tryingtofixhypoandhugs 2016-05-13 05:49:39 -07:00
kevinz000
38876ae3f0 configearmuffs
Peacekeeper borgs now have a config option
"Harm Alarm" now respects and is blocked by earmuffs
Secborg/peaceborg disable config option is now more verbose :^)
2016-05-08 04:48:10 -07:00
phil235
68da092009 Dismemberment port from Hippie code, based on RemieRichard's work. Big thanks to RemieRichards and crystalwarrior. 2016-05-05 18:17:51 +02:00
kevinz000
961ce29dfd ItWorks1
Wow, it actually works now. Just need to work out some of the
kinks/rebalance as needed.
2016-05-04 00:28:09 -07:00
kevinz000
d86f212f36 fixes2ohboylongday 2016-05-03 21:29:19 -07:00
kevinz000
03b604d0dd Revert "Revert "Ohshitifuckedup""
This reverts commit c0c4e0fd8e.
2016-05-03 20:23:41 -07:00
kevinz000
c0c4e0fd8e Revert "Ohshitifuckedup"
This reverts commit 89b12fd17c.
2016-05-03 20:13:49 -07:00
kevinz000
89b12fd17c Ohshitifuckedup 2016-05-03 20:12:18 -07:00
kevinz000
81a61110f0 Fixeshandsandainotification 2016-05-03 02:18:29 -07:00
kevinz000
6fc056f393 trailingreturns 2016-05-03 01:46:43 -07:00
kevinz000
5ea0a911d1 Some more fixes 2016-05-03 00:52:23 -07:00
kevinz000
4282642269 fixes 2016-05-03 00:29:51 -07:00
kevinz000
67456fb6a1 Peacekeeper Borgs! 2016-05-02 23:34:06 -07:00
phil235
0480790b0a Same things but with structures now. 2016-04-24 20:38:33 +02:00
KorPhaeron
53fac5b31d Ruins mining 2016-03-29 03:09:59 -05:00
c0
6b7774a1de fixes 2016-03-11 09:52:20 +03: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
phil235
91839f5f70 Action buttons will now only update when needed instead of every Life().
The action buttons now update their icon instantly.
Fixes versions of pickup(),equipped() and dropped not calling the parent.
Fixes drone not being able to remove a defib from their storage.
You can now cycle the mime mask by clicking it in your hand.
The action buttons for hardsuit and hooded suits now only appears when you're wearing the suit.
Created two mob helper procs getBeltSlot() and getBackSlot().
Created /datum/species/proc/on_species_loss() to handle stuff when our race change, currently only used by jelly and slime race to remove their exotic blood from our reagents and to remove slime people's action buttons.
2016-02-22 00:34:59 +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
phil235
74e8bbf029 Fixes defibbed corpse not getting blind overlay despite being in crit.
Brain mobs that are beaten to death can still be inserted inside a brainless human corpse but defibbing the corpse cannot work (the brain is too damaged). On the other hand cloning that corpse will still work.
Deffibing a brainless corpse no longer gives "further attempts may be successful".
Fixes brain mob's container var not being nullified on Destroy().
2016-02-12 21:47:22 +01:00
phil235
a0855f2693 Brains can no longer be blinded, even when inside a MMI.
Fixes borg made from staff of change not having a brain organ in their MMI.
Removes some duplicated procs in mob.dm (probably due to incorrectly fix merge conflicts)
You can now attack brains with a weapon even when not inside a MMI (previously only when in MMI).
Fixes brain vision not being given mech sight when put inside a mech.
Removing a brain from its MMI not place the brain in your hand instead of on the ground.
Fixes built cyborgs containing two mmis.
Damaged brain from attack can't be placed inside a cyborg.
Robotized humans (called Robotize()) , such as roundstart cyborgs, now have an MMI with the human's name (instead of having a brain with a borg name, which was inconsistent with built cyborgs).
Syndiborgs bought by nukeops now have a brain with the same last name as the ops team.
Fixes Borg created with staff of change not containing a brain organ.
Fixes brain being killable when inside cyborgs. Fixes borg dropping a dead mmi brain unable to talk. Brains are now immune to environment damage and radiation.
Fixes brain being able to suicide multiple times (if put in and out of an MMI)
2016-02-12 02:04:14 +01:00
Bjorn Neergaard
173387eefc Remove borg jetpack, give them ion thrusters instead
Also clean up jetpack human movement because wow that code was messy
Its still bad but its better (tm)
2016-02-09 14:53:37 -06:00