Commit Graph

596 Commits

Author SHA1 Message Date
Ergovisavi 642f79bb59 Replaces the fireball book in the dragon chest with a book of sacred flame, a new spell. 2016-08-22 17:44:14 -07:00
Joan Lung dd1f5c99fd Removes the sine pope (#19966)
* Removes the sine pope

* fuck you too map merger

* fuuuuuuck yooooooou

* map merger you betray me

* no message
2016-08-20 18:12:51 -05:00
Incoming5643 f70ba63d3e You can smuggle smuggler's satchels to a future shift (#19838)
* Hidden Smuggler Satchels hidden beneath the station now persist between rounds, though there's no assurances of WHEN they'll appear next and only one will ever appear in the round.

NOTE THAT THIS PULL INTRODUCES A CRITICAL BUG, DO NOT MERGE *JUST* THIS PR, AWAIT THE FOLLOWUP

* Finishes up satchel persistence.

Satchels require at least 20 saved bags before any will start spawning.

the var persistence_replacement can be set to a path to replace a very high risk item with a lower risk look alike. This is currently done with the nuke disk, the wizards spellbook, and the uplink implant

* DESIGNATED.
REMIE.
PULL.
2016-08-20 16:27:02 +12:00
KorPhaeron f3200ee88a Summon Magic 2016-08-17 19:33:32 -05:00
KorPhaeron 9ee67f942a Projectile Dismemberment and Wizard spellblade (#19783)
* Spellblade

* Plasma cutters and onback sprites

* Cleans up dismemberment projectile code

* Runtime fix
2016-08-11 15:43:29 +12:00
Xhuis 566f89c9d9 Gamemode code improvement (#19354)
* Gamemode code improvement, initial commit

* Wraps up announce messages and removes Henderson

* Fixes an incomplete comment
2016-07-19 10:59:32 +12:00
Core0verload e666d2e76b ports pockets (from Animus Green) and adds them to some clothing.
This PR ports pockets (from Animus Green) and adds them to some clothing.

 Shoes that support storing items now use pockets system.
 Some hats have 1 small pocket.
 Detective's hat spawns with a flask in it.
 Clown's mask has a single tiny top-secret pocket. Honk!

This PR also includes two or three path fixes. It also fixes internal storages (pockets, storage implant) having less "max depth" than external ones.
2016-07-14 19:36:26 +12:00
AnturK 523a2b29fe Implant chair refactor (#19272)
Removes some copypasta
Refactors implant chairs. Adds some fun variations.
2016-07-13 12:59:06 +12:00
GunHog e2cfcb0bd1 Aimed Fireball Spells! (#19030)
* Fireball Spell Changes

- Changes the fireball spell to be click-to-fire.
- Converted Devil and Wand fireballs as well.
- Moved some code to the /proc_holder level to work across the /alien
and /spell branches.

* Tweaks and Fixes

- Infernal Fireball is now a projectile and has the right explosion
values.
- Removed non-projectile spell versions of fireball, as they are unused
- Fixed fireball not seeking adjacent targets.
- Fixed incorrect bolding slashes.

* Fix

Fixes the fireball sometimes missing.

* Fixes and tweak

- Uses TRUE/FALSE defines instead of 0 and 1 for boolean variables.
- Ranged abilities now remove themselves tries to use an ability in a
disabled state. (Such as being knocked out)
- Define for the click cooldown.
2016-07-05 09:06:01 +12:00
Sawu 252fe39ae7 Pope Fixes
* Added a timer to the grab, as well as increasing the range to 4 (from 2).
* Cost of the Dark Seed upped to 2, from 1.
2016-06-27 01:23:34 +10:00
Sawu 93b09ac29b Pope of Sin Changes/Fixes
* Added a new, custom effect to Hades' Sin Shed.
* Hades will no longer repeatedly teleport to the center of the chapel during Flee Phase.
* Hades now slowly gains HP, up to half, when on hallowed ground.
* Spawned and Teleported Acolytes no longer spawn on top of Hades.
* Hades will now lasso targets who try to run.
* Custom beam sprite added for Hades' beams.
* Hades' Rage Ultimate no longer ignores simple animals and non-client objects.
* Hades has a new Ultimate, which will knock down everyone nearby.
* Various pieces of flavor/fluff text added to sins.
* Indulged Sloth no longer gives 1000 stacks of drowyness, now gives 100.
* Hades' Rage Ultimate now has a more appropriately sized effect.
* Hammer of Pride damage balanced out more.
* Hammer of Pride now transfers health between the target and the user, depending on it's indulged status.
* Acolytes of Hades can now be butchered for their outfits and non-functioning versions of their staves.
* Wizards can now buy a Dark Seed, a relic that feeds on living or dead flesh to summon Hades.
* Staff of Hades has been rebalanced through the different versions.
* Hades' sprite updated slightly.
2016-06-26 21:23:37 +10:00
Kyle Spier-Swenson 0d6bbbb412 stop the pills (#18703)
* RedPills Processing

Now you have to use START_PROCESSING(SSname, thing) (and STOP_PROCESSING)

* Fixes a minor bug.
2016-06-20 12:07:44 +02:00
oranges 11c76f5bd7 Merge pull request #18444 from xxalpha/spesstiem
Wizard Spell: Spacetime Distortion
2016-06-13 00:01:23 +12:00
Xhuis 50fd38c4ac Bandaid fix for plasmaman wizards (#18446) 2016-06-11 16:04:20 -05:00
xxalpha a33f30e87f Spacetime Distortion wizard spell. 2016-06-10 18:56:38 +01:00
oranges 744b722a12 Merge pull request #18241 from phil235/BloodRefactor
Blood refactor stuff
2016-06-07 10:09:35 +12:00
phil235 bd20c313b9 Merge branch 'master' of https://github.com/tgstation/-tg-station into BloodRefactor
Conflicts:
	code/__DEFINES/genetics.dm
	code/modules/mob/living/carbon/human/species_types.dm
2016-06-04 17:41:43 +02:00
phil235 b482764a19 - I made human/handle_blood() less shitty.
- We no longer leave a blood trail if blood_volume is below a certain level which depends on the brute damage received. This way dragging a wounded player does have a bad effect.
- We no longer give humans a second reagents var containing blood, and we don't put exotic blood in the mob's reagents. Now we don't store any blood substance inside the mob, we only have a blood_volume var. When we draw blood with syringe we create the reagent that match the type (blood reagent, or an exotic blood reagent)
- can't draw blood from mob if it's low on blood, so we can't empty a mob of its blood entirely.
- Removed the blood type preference appearing in character setting.
- blood pack automatically show blood type, unless manually labeled.
- removed bloody_hands_mob human var and same name glove var.
- Some animals now have blood (pets, goat, cows)
- hitting and dragging mobs with actual blood in their veins leaves blood on you and a trail on the floor.
- probably other stuff that I'll mention in the PR.
2016-06-04 17:33:16 +02:00
Jack Edge eb8907cefe Adds laughter demon bottle to wizard's spellbook
🆑 coiax
rscadd: Wizards have been experimenting with summoning the slightly less
lethal "laughter demon". Please be aware that these demons appear to be
as dangerous as their slaughter cousins. But adorable, nonetheless.
/🆑

By popular demand.
Cheaper than a slaughter demon because it's not going to kill the crew,
it might even end up healing a bunch of people.
2016-06-04 10:56:10 +01:00
Cheridan 9013648696 Merge pull request #18126 from coiax/no-shade-army
Makes chaplain soulshard non-reusable
2016-06-02 10:45:15 -05:00
Jack Edge 2ea09684ec Makes chaplain soulshard non-reusable
🆑 coiax
rscdel: The Chaplain soulshard can only turn a body into a shade once.
A released shade can still be reabsorbed by the stone to heal it.
/🆑
2016-06-01 13:41:02 +01:00
LatD d89eb178c6 Merge remote-tracking branch 'refs/remotes/tgstation/master' into Research 2016-05-30 18:33:55 +03:00
TechnoAlchemist d352ef7a21 New multiverse sword sprites. (#18007) 2016-05-28 16:02:40 -05:00
LatD 907fc36e5c Merge remote-tracking branch 'refs/remotes/tgstation/master' into Research 2016-05-24 22:17:44 +03:00
AnturK c2e3a4d2b6 Merge pull request #17703 from coiax/eight-chamber-heart
Lungs and hearts for mutant species
2016-05-21 11:08:05 +02:00
Cheridan 1ba09d4b16 Merge pull request #17714 from KorPhaeron/construct
New sprite for construct shell
2016-05-19 04:27:36 -05:00
coiax 09e7c2fc60 Makes chaplain soulshard its own path (#17737)
- Changes the name to "mysterious old shard"
- No other changes.

This is mostly so if the chaplain soulstone is nerfed later it'll be
already possible to do so without nerfing all other universal
soulstones.
2016-05-18 02:26:41 -05:00
LatD fe76e64641 Origin tech changes and some fixes 2016-05-17 20:57:01 +03:00
Jack Edge 1f59248224 Adds warnings about lich+cursed heart 2016-05-16 21:39:21 +01:00
KorPhaeron ff13c30b82 New sprite for construct shell 2016-05-16 10:32:12 -05:00
phil235 524a55a757 Merge branch 'master' of https://github.com/tgstation/-tg-station into Dismemberment
Conflicts:
	code/datums/martial.dm
	code/game/gamemodes/changeling/powers/fleshmend.dm
	code/modules/mob/living/carbon/carbon.dm
2016-05-05 21:57:10 +02: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
Nerd Lord 0897f3bc20 Cult communication is now innate and has an action button 2016-05-02 09:11:06 -04:00
Joan Lung 3eeb0cb8e9 Robust Cult changes
* Robust Cult changes

* just cache the turf ffs

* if you see something say nothing and drink to forget

* if you see something, say nothing and drink to forget

* messagefix

* if you see something say nothing, and drink to forget

* if you see something say nothing and drink to forget

* if you see something say nothing and drink to forget

* if you see something say nothing, and drink to forget
2016-05-01 21:37:02 -05:00
Cheridan d662b0e455 Merge pull request #17218 from phil235/FixTalkingInPipes
No longer deaf while inside pipes
2016-04-29 20:34:03 -05:00
phil235 750eaa4a57 invisibility = 100 and 101 now use defines. 2016-04-29 01:00:05 +02:00
Robustin b5952c94cc Merge branch 'master' of https://github.com/tgstation/-tg-station into commitcommoncult
# Conflicts:
#	icons/obj/items.dmi
2016-04-27 22:04:06 -04:00
Robustin 45de806acf Joan correction 2016-04-25 10:23:24 -04:00
Robustin ecce6436d1 Requested Changes 2016-04-24 20:46:27 -04:00
phil235 0caa59b21a First commit of this big PR
These are the files with just tiny tweaks. Mostly modify an object's attackby so it does "return ..()" instead of "..()".
If there are other things in this commit, the PR's description will explain them.
2016-04-24 20:26:24 +02:00
Robustin 1538dc6cd2 Update soulstone.dm 2016-04-23 16:53:37 -04:00
Robustin 105c1a785a Prevents noncultists/wizards from making construct 2016-04-23 16:23:40 -04:00
KorPhaeron cfec4218fb Wizard 2016-03-18 21:45:57 -05:00
Cheridan ffb14ed84d Merge pull request #15788 from Shadowlight213/Oldcultredo
Remake of #15690. Replaces newcult with oldcult.
2016-03-01 22:37:58 -06:00
tkdrg 799e923eff Merge pull request #15840 from phil235/RobotAttackSelfFix
Cyborgs can no longer activate the object in their active module when incapacitated
2016-03-01 21:14:55 -03:00
phil235 4d2c6b8e24 Cyborgs can no longer activate the object in their active module when incapacitated. They also can't change their sensor mode (sechud, etc...) while incapacitated.
Fixes Wizard apprentice not being able to use soulstones.
2016-02-29 23:09:13 +01:00
phil235 3c8a9274bf Fixes spell action button not being updated correctly regarding zlevel and clothes requirements. The buttons are now always not red in these cases but clicking them give the proper fail message.
Fixes blind AI (lack of power) staying blind if transfered to a mech or a card.
Fixes magboots action button icon not updating when toggling the boots on.
Fixes Area teleport spells not having a cancel button when choosing the destination area.
Fixes spell action button not being removed when the spell is refunded.
Fixes revenant spell action button icons not being updated when the revenant is inhibited by a null rod.
2016-02-29 16:30:54 +01:00
Shadowlight213 642321b5cd Removes newcult and readds oldcult 2016-02-27 00:53:14 -08:00
Remie Richards abf466e9bc Merge conflict fixes, Uses newly refactor actions, All cursed hearts can now be inserted by hand, not just wizard ones. Fixes organ actions trying to be granted to the object, not the user.
Merge branch 'master' of https://github.com/tgstation/-tg-station into cursed_heart

Conflicts:
	code/modules/surgery/organs/organ_internal.dm
2016-02-24 02:33:22 +00: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