Commit Graph

707 Commits

Author SHA1 Message Date
Aranclanos
d5ddac3a00 Merge pull request #1934 from RobRichards1997/30/11/2013-Toxic-Converter-Cyberlimb-Fix
Cyber limbs fixes [FIXES #1920] + [Fixes #2180] + [RUNTIME FIX]
2013-12-30 10:23:54 -08:00
Robson Richards
6397796058 Removes a Check by Aran's request 2013-12-30 17:31:39 +00:00
Robson Richards
d3d4c79946 Merges Heal_Damage and Heal_robotic_damage procs
like I should have done in the first place.
Corrects all usages of Heal_damage so it works with the changed version.
Same goes for Heal_robotic_damage
2013-12-29 17:40:12 +00:00
Robson Richards
08ec9df967 Fixes it for Nonhuman mobs. 2013-12-29 02:25:12 +00:00
Robson Richards
819bb9451d <3 Aranclanos, You always know what's best. 2013-12-29 00:52:13 +00:00
Robson Richards
889b9c66f3 Merge branch 'master' of https://github.com/tgstation/-tg-station into Toxic_converter_Fix 2013-12-29 00:40:24 +00:00
Incoming
26a1bb65f2 Merge branch 'master' of https://github.com/tgstation/-tg-station into wands3
Conflicts:
	code/modules/mob/death.dm
	code/modules/mob/living/carbon/alien/death.dm
	code/modules/mob/living/carbon/brain/death.dm
	code/modules/mob/living/carbon/human/death.dm
	code/modules/mob/living/carbon/monkey/death.dm
	code/modules/mob/living/silicon/death.dm
	code/modules/mob/living/silicon/robot/death.dm
2013-12-27 00:55:44 -05:00
Perakp
9d0c3bf52e Fixes runtimes if a non-human would somehow get the mime speech spell. Only humans have .miming 2013-12-23 18:12:04 +02:00
Perakp
0d1ba1eccf Changes mime abilities into spells. Admins can now give these from the 'give spell' menu. Unlike previous mime abilities, these are not transferred when a mime is cloned. 2013-12-21 20:54:07 +02:00
Incoming
a27ec365ef Feature: Changed how used books of mindswap punish people. Now if you use a used mindswap book it marks you to be used in a mindswap with the next unfortunate soul who reads its. Some Limitations: You can escape the impending mindswap by changing forms or being dead when the next time someone tries to read the book. You can of course also just keep the book safe or destroy it if you accidentally read one. Only works with things that have hands. Consider intentionally reading one as a monkey then giving it to the captain.
Feature: After some serious testing (and because it was already being done on live servers thanks to wabbajack() preserving spells) I've removed the compatible_mobs list for mind_transfer, meaning you can now mind transfer to any player controled living mob.

Flowery fluff that no one would ever care about: changes the mindswap message for trying to swap into a dead guy, since a spell holder isn't nessisarily a space wizard
2013-12-21 12:23:50 -05:00
Incoming
689aecc336 I forgot how children work guys
Merge branch 'master' of https://github.com/tgstation/-tg-station into wands3
2013-12-19 15:07:59 -05:00
Robson Richards
78d1c8c112 Changes the heal proc to use get_damage twice instead of using the proc twice. - for Gia. 2013-12-19 19:49:10 +00:00
Incoming
ac1a96fd43 feature: renames the monkeyizing var to "notransform" since that's how it was being used in the code, as a flag to tell code to ignore transformation (initially because they were already turning into a monkey).
bugfix: gives notransform to etheral jaunting based on an observed edge case where a wizard was staff of changed while starting a jaunt and got stuck in bluespace for the rest of the round

meta: modified revive() so I could remove all that horrible snowflake I introduced to let reviving simple mobs come back
2013-12-19 11:50:33 -05:00
Aranclanos
f1677efdea Merge pull request #2040 from Razharas/master
Some logging and fingerprints
2013-12-17 21:03:36 -08:00
Razharas
358a85eb3d Completed the transition to a new proc
All the logging i have found in the code was changed to use the
proc(maybe i missed something)
Killed all runtimes found so far
Proc now handles all the checks, no need to add checks in the body of
object
2013-12-17 22:56:04 +04:00
Incoming
6efd7d39e0 Adds new and better wand and spellbook sprtes by Neerti
Adds new functionality where wands will look different once they're out of charge for at a glace judgements
Adds a wand of nothing to the hacked item list for the autodrobe, by popular request
2013-12-15 16:55:11 -05:00
Aranclanos
1ecd895bce Merge pull request #2011 from Incoming5643/wands2
Magic Mania (Summon Magic/Charge/Wands&Staffs/One Time Spellbooks/New Apprentice)
2013-12-14 19:58:17 -08:00
Giacomand
ceec829294 Tons of typo fixes and renames Centcomm to Centcom. Manual merge of #1950. 2013-12-13 21:14:23 +00:00
Incoming
5012ccd273 Merge branch 'master' of https://github.com/tgstation/-tg-station into wands2
Conflicts:
	icons/mob/back.dmi
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
2013-12-12 00:38:47 -05:00
Incoming
c396c3ae8a Suggestion implimentation patch!
*Span classes the whole update
*Spellbooks no longer vanish after being used, instead used spellbooks now have various bad effects should they be attempted to learned from again (the original reader won't acidentally fall to this, as they will just say "I've already read this"). Leave em out as traps for people or properly dispose of your trash! Or...
*The charge spell can now attempt to recharge one use spellbooks so someone else can learn the spell. This only has a 20% success rate and will destroy the book should it fail (even if the book was actually unused). You can't attempt this on the wizard's spellbook
*The "staff of nothing" (functional) placeholder now uses the generic staff sprites
*Spellbooks can now be placed in bookshelves just like normal books
*The teleport spell won't yank anchored things anymore, but as a consolation it will warp the entire contents of a tile should it be targeted. The code has been tweeked so this shouldn't effect the server too bad even if large numbers of items are warped to unique locations this way
2013-12-12 00:24:51 -05:00
Incoming
51d12a7512 Adds all sprites for all wands, books, and the staff of healing
Fixes an issue where someone spamming a wand might lose charges without actually firing the bolt
Removes a few missed bugtesting lines
Adds a var (variable_charges) to be disabled for wands with assured max charges for future use
2013-12-09 12:46:34 -05:00
Incoming
ca920321ae Merge branch 'master' of https://github.com/tgstation/-tg-station into bombchange
Conflicts:
	maps/tgstation.2.1.2.dmm
2013-12-06 12:20:35 -05:00
Incoming
4ac8a4164c Summon Magic / Charge / Wands&Staffs / One time spellbooks / New Apprentice
---

Summon Magic:

This new wizard spell works much like summon guns except it instead brings the crew magical tools and weapons. There are preexisting artifacts (minus some that would cause huge confusion/balance issues) as well as new spellbooks, wands, and a staff. The chance of survivor antag is the same as summon guns.

---

Charge:

This new spell allows for the recharging of otherwise unrefillable wands, but there's a heavy chance that the total number of charges will decrease with each casting until eventually they're impossible to keep recharging. As a bonus the charge spell can also be used to charge batteries and things that run on batteries (such as energy weapons). This carries the same max charge weardown penalties however. Lastly this spell allows a wizard to charge other wizards with a grab, reseting their spell cooldown. They cannot use it to charge themselves. It has a 60 second cooldown.

The wizard cannot buy this spell himself, it only comes randomly to the crew during Summon Magic and with the new apprentice loadout.

---

Wands&Staffs:

Magic weapons have been overhauled into their own catagory so there won't be any more weirdness with batteries in staves or apparent magic resistance on things that reflect energy weapons.

Wands have been added, these wands come precharged with a number of shots that can be fired off at their leasure but cannot be recharged once emptied (unless the charge spell is used). They come in a varity of exciting flavors:

*Death: Slays instantly but has very few shots (1 to 3)
*Resurrection: Revives and/or heals instantly but has very few shots (1 to 3)
*Polymorph: Same function as the staff of change
*Teleport: Weaponized blink spell that doesn't respect space tiles and can also warp away machinery or items (but not turf)
*Door Creation: Puts easy access wooden doors in walls
*Fireball: Same function (but slightly lower damage) as the fireball spell
*Nothing: Lame and useless

Wands can also be used on the user (unlike staves) by clicking on them. Warning messages have been added to a few wands so people don't accidentally zap themselves with the wand of death unless they really want to.

Wands cannot be aquired by the wizard directly, and are only spawned during castings of summon magic.

There is also a new staff, the staff of healing, which works as a recharging version of the wand of resurrection. The new apprentice starts with one of these, and they can also be found during summon magic. The wizard cannot purchase it directly, and as a stave he could not use it on himself anyways.

---

One time spellbooks:

Found exclusively in summon magic are one time use spellbooks that can teach any player a robeless spell. Once read the book vanishes.

Books come in the following flavors:
*fireball
*smoke
*blind
*mindswap
*forcewall
*knock
*curse of the horsemen
*charge (described above)

---

New apprentice:

A fourth loadout for apprentice wizards has been added. This wizard is intended as a support role and comes with forcewall (for cover) and charge (used to keep him and the wizard well stocked in laser weaponry or to restore the wizard's cooldowns). It also comes equiped with a free Staff of Healing for keeping the wizard alive. Shoot the medic first folks.
2013-12-04 21:00:36 -05:00
Giacomand
088cb5afd3 Merge branch 'master' of https://github.com/tgstation/-tg-station into virus_tweak
Resolved Conflicts:
	html/changelog.html
2013-12-02 20:20:35 +00:00
Giacom
0862393aeb Merge pull request #1924 from Limeliz/GamelogFix
Removed href-stuff being saved in adminlogs.
2013-12-01 03:41:31 -08:00
Robson Richards
69f7119467 Removes the DME, God damn silly error 2013-11-30 13:28:40 +00:00
Emil
95a2fff302 Fixed out of date mind.dm, then applied the fix. 2013-11-30 00:17:38 +01:00
Emil
e82a06fc68 Update mind.dm
Should fix #1870 where href-crap was saved in the adminlogs.
2013-11-28 15:55:01 +01:00
Giacomand
2e5d4c4fcc Merge branch 'master' of https://github.com/tgstation/-tg-station into virus_tweak
Resolved Conflicts:
	html/changelog.html
2013-11-27 15:58:42 +00:00
Aranclanos
42f5883cdf Added a check for the target of the magic missile between the sleeps. This will stop the runtimes and the MM objects from being stuck in the spot (I think you can pull them though) 2013-11-27 05:47:36 -03:00
Aranclanos
3fed8dd8f6 Merge branch 'Cybernetic-limbs' of https://github.com/RobRichards1997/-tg-station into Cybernetic-limbs
Conflicts:
	code/modules/mob/living/carbon/human/human_defense.dm
2013-11-26 22:03:26 -03:00
Giacomand
61a7049cd7 Viruses are less random and you can determine the level of symptom you would get. Virus food will generate low level symptoms, Mutagen will generate medium level symptoms and Liquid Plasma will generate high level symptoms.
Virologist starts with a small bottle of liquid plasma.
Filled in the gaps between the chem master with RGBA(255, 255, 255, 1) so you do not accidentally click on the floor anymore.
ChemMasters now has the green light overlay, which is only used by Pandemics but it looks better than red.
2013-11-26 19:33:39 +00:00
Incoming
e428e04787 Adds sprites for the detonator and the bomb core
Fixes some punctuation
2013-11-24 17:35:31 -05:00
Giacom
d7b6001f98 Merge pull request #1835 from Cheridan/NukePR
Scale Ops 1.1
2013-11-24 13:51:07 -08:00
Cheridan
f0c7163af7 Merge pull request #1865 from Aranclanos/HumanizeButWheresTheMonkey
Humanize() runtimes
2013-11-23 16:01:45 -08:00
Cheridan
df9bc262bf Merge pull request #1798 from kyrahabattoir/vending-reloadedB
Vending reloaded!
2013-11-23 11:40:34 -08:00
Cheridan
7bba87b7ab Merge pull request #1854 from Aranclanos/NanoUIMobTransformations
NanoUI mob transformation runtime fix
2013-11-23 11:01:29 -08:00
Aranclanos
c9f4de2834 Added some sanity check for when the humanize() proc call finishes. This proc includes a sleep() and it might return nothing of the mob is deleted before the sleep ends.
Others way to engage the issue wouldn't be fair.
2013-11-22 18:38:39 -03:00
Aranclanos
6a2bc0b6c5 Added some sanity after the spawn() procs in the wire datums of APCs 2013-11-22 15:50:28 -03:00
Incoming
87872e81e1 Syndicate Bomb Tweaks:
Syndicate Bombs now have enforced 60 second minimum timers, up from 30. Their crystal cost remains at 5.
Syndicate Detonators that can get around the 60 second timers are purchasable for 1 crystal for all (there are also ways to get around it with clever uses of the wires, but that's not new)
The Nuke Agents get a free syndicate detonator [MAP]
Syndicate Bombs can now be further disassembled beyond disarming them to let people actually lift the explosives out of the bomb, rendering it useless. These explosives will only detonate in the presence of another explosion, and give great research levels.
2013-11-22 04:01:51 -05:00
Aranclanos
6e7a7b365b NanoUIs will now only transfer their mob UI list on a mob transformation if the old mob exists. No extra checks, just better placement for the NanoUI user_transfered() proc call.
This will fix some runtimes.
2013-11-22 05:09:47 -03:00
Cheridan
d814414227 Scale Ops 1.1
Reduces the costs of some items based on feedback.
Op lockers now start with a new miniaturized jetpack.
2013-11-20 17:59:02 -06:00
Kyrah Abattoir
e6ee419f47 ADDED costume restocking unit
REMOVED many useless comments
ADDED invoke vending_refill consutructor superclass

ADDED: Cargo can order the autodrobe supply crate
2013-11-18 19:15:23 +01:00
Robson Richards
e71ea3289e Merge branch 'master' of https://github.com/tgstation/-tg-station into 13/10/2013-Limb/organ-stuff
This probably broke everything... :(
2013-11-17 18:09:14 +00:00
Robson Richards
890362a61a Commiting some soft Updates of commits I'm behind on and Committing the rest via git. 2013-11-17 18:02:43 +00:00
Robson Richards
637c3f7f63 Fixes for @Aranclanos
Diseases now have a requires and a required_limb variable
if requires is 1 then it will run a check for required_limb (WHICH USES TYPEPATHS)

Reverts a turret change that git through into the pull for some reason

added some feedback messages in certain places

removed the hulk-like snowflake check that was really crappy anyways

Reworked a part of surgery/surgery_step.dm to use a switch
2013-11-16 18:13:41 +00:00
Kyrah Abattoir
bded9d1bf6 Merge branch 'master' into vending-reloadedB 2013-11-15 21:58:27 +01:00
Kyrah Abattoir
e11b05416b New system based on restocking points rather than fixed inventory. 2013-11-15 01:04:32 +01:00
Cheridan
16b2bc833f Merge pull request #1753 from Giacom/tele_sci_tweak
Telescience Update
2013-11-14 15:30:01 -08:00
Giacomand
0824bbd599 * Tidied up the code.
* Changed some code to use the teleport datum features.
 * Fixed a broken check in the teleport datum.
2013-11-12 19:49:36 +00:00