Commit Graph

745 Commits

Author SHA1 Message Date
Giacom
c8120da49c Merge pull request #2283 from YotaXP/list2text-refactor
Optimized and refactored list2text, text2list, and replacetext.
2014-01-11 10:11:13 -08:00
Aranclanos
2417d19141 Merge pull request #2299 from Giacom/damage_convert_fix
Fixes toxic compensation giving you toxins while at full health.
2014-01-11 08:08:37 -08:00
Giacomand
26d7a263bf Merge branch 'master' of https://github.com/tgstation/-tg-station into pr/2251 2014-01-11 14:06:36 +00:00
Giacomand
1a41abc609 The wire dialog will now properly close.
Refactored some of the code into procs.
Small feature: bombs tick louder when they are 10 seconds or less left, nuclear bombs were given the same treatment but with 20 seconds.
Fixed a bug with the syndicate bomb wire datum not using the CanUse().
2014-01-11 14:05:51 +00:00
Giacomand
3a026b3f4d Fixes toxic compensation giving you toxins while at full health. 2014-01-10 13:44:57 +00:00
Aranclanos
a27d85934e Merge pull request #2278 from Giacom/toxin_filter
Fixed a bug with the toxin filter.
2014-01-10 01:05:31 -08:00
Giacom
bc42827194 Typo fix. 2014-01-08 17:55:32 +00:00
Giacom
f89673ae18 Made self-respiration use dexalin instead. 2014-01-08 13:15:06 +00:00
YotaXP
f98a57b750 Optimized and refactored list2text, text2list, and replacetext.
Also fixed some grammar in the station blueprint code.
2014-01-07 22:15:25 -05:00
Incoming
7418700cce Adds a badmin bomb that lets you var edit the explosion (for pure firebombs and stupid huge explosions [remember to toggle the bombcap first])
Changes how wire shuffling works to cut down on abandoned wires.

Removes a rogue processing_objects I missed before
2014-01-07 20:50:25 -05:00
Giacom
c270e177a8 Correctly set the values so there's no chance for underhealing
Apparently damage_converter converts 6 or 12 damage, plus the randomness of the symptoms makes it hard to predict.
2014-01-07 21:35:23 +00:00
Giacom
8ba1d2c033 Fixed a flaw with the toxin filter.
Increased the amount of damage the toxin filter heals to be able to keep up with the damage converter symptom.
2014-01-07 21:27:25 +00:00
Cheridan
0102191bbc Merge pull request #2247 from Giacom/blinkyoself
Changed blink to only spawn a single static smoke cloud.
2014-01-07 08:28:06 -08:00
Cheridan
fbeeae0a4c Merge pull request #2230 from Intigracy/Redbuttonisshittysoisdoubleagent
Big red button / syndicate bomb changes
2014-01-06 18:23:07 -08:00
Cheridan
cf0d70c767 Merge pull request #2237 from Jordie0608/ispentareallylongtimeonthis
Fixed justicebot
2014-01-06 14:12:26 -08:00
Cheridan
49da9996ef Merge pull request #2228 from Incoming5643/LOGDEMSPELLS
[Maniac Mansion] Adds attack logging to learning spells from one time use spellbooks
2014-01-06 13:40:04 -08:00
Incoming
e3cf67ee72 Adds New Bomb/Bomb Cores + A BIG bomb bugfix
Adds a training bomb that doesn't explode but rather lets you know it would have exploded. Upon detonation or defusal it will give you your current score and rescramble the wires for another go. It should probably be added to the map somewhere in a pull that follows this.

Adds a badmin bomb that lets you summon in a number of whatever you want with var editing, it defaults to a single cookie.

Adds a specially skinned badmin clown bomb that summons in a 100 clowns by default. It honks!

Fixes a HUGE bug where, thanks to machinery automatically adding themselves to processing, bombs were ticking down two seconds at a time. This does mean that all bombs are now "nerfed" to twice the time it took before. Whether this is a good thing or should result in the timer going "back" to 30 seconds to keep the timing consistant is an open quesion.
2014-01-05 20:23:38 -05:00
Giacomand
3fbeebfb6e Changed blink to only spawn a single static smoke cloud.
Fixed blink not triggering the AI turrets.
2014-01-05 20:41:06 +00:00
Cheridan
bf9fa21ddc Merge pull request #2149 from Miauw62/kittens
Kittens!!!! !!! !! !! !!!!!! !
2014-01-04 20:21:15 -08:00
Cheridan
db67b90968 Merge pull request #2218 from Incoming5643/bombrefactor
Refactors syndicate bombs to remove the var degutted
2014-01-04 19:44:25 -08:00
Intigracy
0cbe8dde9e Makes it so that the button is only in nuke-ops, and the bombs are NOT in double agent. 2014-01-04 12:01:13 -08:00
Jordie0608
efc9b25083 Fixed justicebot 2014-01-05 04:24:22 +11:00
Intigracy
6426e00bc5 Makes the big red button only spawnable by nuke ops.
Fuck having rounds ruined in the first 30 seconds by people throwing a bomb at genetics and pushing the button, and then spamming it since, due to it being Double Agent, every other agent is also buying bombs.
2014-01-03 18:41:25 -08:00
Incoming
50838d701d Adds attack logging to learning spells from one time use spellbooks and casting of spells. 2014-01-03 17:40:32 -05:00
Miauw
61ed6a5e15 Merge branch 'master' of https://github.com/tgstation/-tg-station into kittens
Conflicts:
	code/modules/mob/living/simple_animal/simple_animal.dm
2014-01-03 19:27:51 +01:00
Giacom
0cd059432e Merge pull request #2135 from ChuckTheSheep/patch-2
Fixed an oversight in Wizard-Spell targeting code
2014-01-02 10:33:27 -08:00
Incoming
de972e3b02 Refactors syndicate bombs to remove the var degutted.
The bombs themselves no longer explode, the payloads (which now actually exist in the bombs) do.

This means that you can play cruel jokes on people by activating bombs with removed payloads or easily code in other kinds of payloads (there'll be a future pull with a few from me at the very least) and not have to touch the bomb code itself.
2014-01-02 12:20:05 -05:00
Perakp
a7ead625be Fixes Ethereal Jaunt
notransformation protection was stopping movement calls to the holder object.
Refractored code so wraith phase shift isn't copypaste just to change animations.
2013-12-31 17:28:50 +02:00
Aranclanos
15d055a602 Merge pull request #2031 from Alek2ander/master
VV permissions check update, fixes #2009
2013-12-30 12:50:09 -08:00
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
Miauw
f1376608eb Added kittens and Proc, sprites by Nienhaus. 2013-12-27 15:44:40 +01: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
ChuckTheSheep
56059f67c3 Update spell.dm 2013-12-24 09:31:00 -05:00
ChuckTheSheep
4a59eca9ba Fixed an oversight in Wizard-Spell targeting code
Added an extra safety check to check if targets selected via inputs were actually in range. Previously someone could open a bunch of inputs and activate them from what ever range.
2013-12-23 18:42:15 -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