Commit Graph

80 Commits

Author SHA1 Message Date
lordpidey
810f3d9052 Small devil fixes (#19302)
* Removes errant cast from devilinfo.add_soul()

* Clarifies a banishment ritual in the Codex Gigas.

Sprinkling holy water isn't enough, it needs to be in the devil's bloodstream.

* Infernal jaunt now correctly extinguishes the user.
Revival contracts no longer actually set the target on fire, but rather uses a fake fire.

* Pitchforks don't burn devils or soulless on use/pickup anymore.
Adds cast charge time to infernal jaunt, so that it's impossible to jaunt while already jaunting.
Adds feedback to using infernal jaunt to jaunt in.
2016-07-14 19:41:01 +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
Jack Edge
a09544992c Merge branch 'master' into shuttle-processing
Conflicts:
	code/modules/shuttle/ripple.dm
2016-06-26 01:00:25 +01:00
Jack Edge
201da77121 Fixing some bugs with sparkles 2016-06-25 16:51:19 +01:00
Jack Edge
27d6c284ed Merge branch 'fun-balloon' into shuttle-processing
Conflicts:
	_maps/shuttles/emergency_bar.dmm
	_maps/shuttles/emergency_narnar.dmm
	code/modules/spells/spell_types/wizard.dm
2016-06-25 16:26:22 +01:00
Jack Edge
df9bd80c03 More spawn() removal and timers and stuff 2016-06-25 11:55:21 +01:00
Jack Edge
81a4e188bc Code review 2016-06-19 10:15:26 +01:00
Jack Edge
e33692b1c1 Removes spawn() from things I
- Removes from Sin of Greed slot machine (also cleans up the visible
message to make a difference between viewer and user)
- Removes from ferry request cooldown
- Removes from knock opening doors and closets
2016-06-19 01:06:51 +01:00
Cruix
ac0bad5d61 Added priority overlay system. (#18225)
Added priority overlays to atoms, which will not be removed when overlays are cut and will always remain on top when new overlays are added. This requires everyone to use add_overlay() and cut_overlays() instead of overlays += and overlays.Cut(). These procs are found in __HELPERS/icons.dm, and the priority overlay list is found in game/atoms.dm. Everything else is replacing deprecated overlay manipulation.
2016-06-17 10:11:53 +12:00
Jack Edge
5722bbe714 Sentience balloon added 2016-06-15 21:12:39 +01:00
kevinz000
fe3faada41 mekhihasnosenseofrightandwrong 2016-06-15 03:32:21 -07:00
lordpidey
f640d7ddb7 Devil fixes (#18520)
Numerous small fixes/changes/balances to devils.

Notable changes:
It now requires more souls to increase. It is now 3,7,12 souls, up from 3,6,9.
Devils now have extra rules, no coercing into signing contracts with violence, and no intentionally physically harming another devil.
Burial garment banishment now works on true devils. <--- Unreported issue, can I use that fix for the mergetoken?
Renamed all demon files to devil
Updated religious supplies to have burial garments.
Burial garments re-added to box/meta
Increased infernal fireball cooldown
Soulsellers can now use a pitchfork without being harmed.
Added new book crate, which includes a codex gigas to cargo.
2016-06-14 15:43:33 +12:00
PKPenguin321
1bb13e13da fixes spacetime distortions moving through spacetime (#18527)
fixes spacetime distortions moving through spacetime by anchoring them
2016-06-14 14:18:15 +12:00
oranges
b20a5642de Merge pull request #18473 from RemieRichards/setDir()
Set dir()
2016-06-13 00:03:44 +12:00
Remie Richards
fda2c699fc Automatic conversion via Regex 2016-06-11 18:37:48 +01:00
xxalpha
1a01acf4af Prevent the game from hanging if bullets find an infinite loop. 2016-06-10 19:47:55 +01:00
xxalpha
a33f30e87f Spacetime Distortion wizard spell. 2016-06-10 18:56:38 +01:00
oranges
07bd09da5c Merge pull request #18340 from coiax/fix-18338
Repulse sparkles now disappear
2016-06-09 09:14:32 +12:00
Mike Long
1fbd8d71f9 Merge remote-tracking branch 'tgstation/master' into jauntfix
# Conflicts:
#	code/modules/spells/spell_types/demon.dm
2016-06-08 13:20:04 -04:00
AnturK
19eb97ae18 Moves some list initializations to New
Fixes missing ..() calls in New()
2016-06-07 18:39:13 +02:00
Jack Edge
da134e2eeb Repulse sparkles now disappear
It wasn't kevinz000's fault, it was mine.
2016-06-07 11:20:44 +01:00
Mike Long
b12a9fb7fc Refactor & nerf infernal jaunt.
Infernal jaunt now has a warm up time for entering and exiting the jaunt.

Plus it looks nicer too.
2016-06-06 23:01:23 -04:00
GunHog
bfd644231f Merge remote-tracking branch 'remotes/upstream/master' into Aimed_Spit_For_Mista_Jay
# Conflicts:
#	code/modules/mob/living/living_defines.dm
#	icons/mob/actions.dmi
2016-06-06 20:05:23 -05:00
Jack Edge
a01b48aa48 Removes spawn() from some things
Yay, refactoring.
2016-06-05 20:08:36 +01:00
Thunder12345
a9a97f5a81 Fixes for Merge Tokens (#18168)
* fixes #15649
fixes #16575

* oops forgot those lines
2016-06-03 14:46:42 -05:00
GunHog
4b9aada951 Uses client click intercept
- Alien spit now uses click intercepts in the client
- Risk of bugs greatly increased
2016-06-02 11:01:45 -05:00
GunHog
9e3a55e2e1 Aimed Xeno Spit
- Neurotoxic spit is now an aimed projectile.
- Research analyzer action button updated
- Framework for adding more aimed things later
2016-06-01 13:43:19 -05:00
Cheridan
737cddee68 Merge pull request #18018 from Xhuis/general_rabbits
Clockwork Post-Merge Patch II
2016-05-29 13:34:58 -05:00
Xhuis
76c033cfdc Several changes to clockcult 2016-05-29 00:50:02 -04:00
Lularian
8aa135f470 fixes some of the crap maybe 2016-05-28 11:08:46 -05:00
Joan Lung
2cfb2d8eed Layers are now defines (#17949)
* Layers are now defines

* this looks better

* GAS_phil_LAYER

* no message

* remove the three unneeded defines

* no message
2016-05-27 22:16:21 +02:00
oranges
8d6da5d01f Merge pull request #17796 from bgobandit/sofuckingmetal
Runed metal no longer deletes girders when used on them.
2016-05-21 22:56:45 +12: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
bgobandit
b2ea93323d Runed metal no longer deletes girders when used on them. 2016-05-19 16:46:57 -04:00
lordpidey
b4b93bd561 Adds new objective for devils to have X people on station be sintouched. (#17616)
* Adds new objective for devils to have X people on station be sintouched.
Adds spell that causes nearby humans to be sintouched.
Drastically lowers chances of codex gigas sintouching it's reader.

* Fixes a runtime.
2016-05-17 21:37:08 +01:00
Jack Edge
1f59248224 Adds warnings about lich+cursed heart 2016-05-16 21:39:21 +01:00
paprika
a45ea3293f Merge branch 'master' of https://github.com/tgstation/-tg-station into PixelProjectiles 2016-05-11 19:18:50 -07:00
Nerd Lord
c75b455e36 unrobustin fixes 2016-05-09 15:45:31 -04:00
Nerd Lord
4e2cefaddf Merge branch 'master' of https://github.com/tgstation/-tg-station into fixrobustinscode
Conflicts:
	icons/mob/mob.dmi
2016-05-08 14:33:54 -04:00
lordpidey
24f47b0223 Devil Antag Round 2. (#15794)
* Re-making the branch and PR of demon.  See #15118 for the old PR

* Adds toy demonologist to arcade machine reward list.

* Implemented two suggestions: Pitchfork now has a demonic subtype, to potentially give botanists a normal pitchfork.

Suiciding with signed contract now uses forcesay instead of say.

* Fixes compile errors.
Re factors contracts to be subtypes rather than datums.  <--- incomplete, still need to summon them appropriately.

* buffed infernal power contract to give passive healing
Nerfed magic power contract to not give robeless MM

* Fixes compile errors

* Corrects orientation of true demon sprite

* Begins work on the sNPC for the true demon/ arch-demon

* Added funeral garment sprites.  These will be used in banishment rituals (hopefully)

* Stashing my work so I can move to another computer.

Re-working the true-demon, it will be a carbon rather than a simple mob.

* Revert "Stashing my work so I can move to another computer."

This reverts commit e8b1e032997b7e17af4ad8630bf21d3620195c4e.

* Git exploded for me, so I have to make a new branch with EVERYTHING.  sorry.

* Fixes compile error

* Ghosts can now click on an arch demon to become a slaughter demon

* Begins to convert demons into a carbon rather than simple mob.

* Demons now resurrect if not banished.

* Beepsky now properly tells security chat about the level 666 threat.

* Contracts now work again.

* old spells now get removed properly.

* adding pitchfork sprites

* Adds hud for the true-demon.  Not functional.

* Fixes another error in the demon hud.  Still broken.

* Demons are no longer immortal, demon huds work properly now.  (it's barebones, but it works.)

* Fixes the "Have mortals sign at least # contracts of TYPE" objective

* Fixed typo in banishlore() and updated wrath/envy sintouch objectives.

* Adds huds for demons/sintouched/soulless, however they are currently unused.

* Updates the demon's hud to work with the recent hud changes.

* Cleaned up infernal jaunt, it works a lot better now and is less buggy.

* Revival contracts now actually take your soul.

* Fixes #16513

* Replaces the infinite slaughter demons with infinite imps.  Sprites for imps are still needed.

* Adds sprite for imps.  It's a redder, smaller slaughter demon.

* Fixes lack of icon for pitchforks

* Gives summon wealth a more appropriate icon.

* Fixes small part I forgot to merge.

* Fixes a few bugs with demonic resurrection.  It's still very buggy.

* Derp, my bad, I didn't mean to admin myself on the main server.

* Fixes edge case of demonic resurrection failing.  Debraining the demon is NOT supposed to be an alternative for the banishment ritual.

* Also did not mean to change this config file.

* Fixes another error in type 1 demonic resurrection.  It works properly now.

* Updates employment contract text.

* Fixes type 2 resurrections.
Demonic contracts are once again permanently on fire.

* Replaces toy demonologist with toy demonomicon.  It still works the same, just different icon/name.

* Adds demonomicon and employment cabinet to box/meta/dream/efficiency.

I could not add it to mini/bird due to conflicts.

* Edits ministation and BirdStation to have demonomicons and employment cabinets.

* Fixes spelling error

* Adds burial garments to maps.

* Update photocopier.dm

Fixes the span when inserting items into photocopier

* Fixes disrupt_spells proc

* Makes a lot of changes as reccomended by Remie.

* Fixes a compile error.

* Updates the lawify/loreify to be lists.  Does not compile.

* Fixes compile errors.

* Arch demons no longer regress upon death.
Speaking a demon's truename gives the demon the opportunity to teleport to you.
Makes demonomicon not care about capitalization.

* Fixes startup error.  Demonic summoning now works.  It's very simple, just say their true name.

* Demons now have a tongue.  True demon bodies are deleted upon regression.

* Demons can now be punched.
Demons can no longer resist a fire out, since it does nothing to them.

* true demons show up in player panel.  Hellfire works again.

* Prepares for commit 16940

* Demons are now known as devils.

Still needs testing.

* Oops, didn't commit everything last commit.

* Finishes converting demons to devils.

* Fixes speech for lizards/flymen when they speak a demon's name.

* Update tips.txt

* Changes variable from static to global as per Remie's suggestion.

I disagree with Remie's assessment, as a list that will never change, even between games, seems like it should be static.

* Removes devil summoning.  Hopefully, I'll be able to eventually find a way to implement it satisfactorily, but for now, I'll leave it out.

* Removes carriage returns

* Combined modified icon files

* Fixes #17184

* Imps no longer show up in the end round report.  This is because there can EASILY be 100+ imps if the crew is well armed.

Non-employment filing cabinets no longer take 30 sec to wrench/unwrench.

* The lawyer can actually buy souls back now.  Oops.

* Fixes true/arch devil spritesheet to have correct sprite names.

* Relocates Box's employment cabinet to Law office.

* De-devil-ing someone now removes the devilinfo.
De-devil-ing now returns an error when used on true and arch devils

* Re-factors whiteness code for jumpsuits.

* Merges icons, reverts failed merge of map

* Merges map with CAS decks

* Fixes copying employment contracts

* Derp, fixes compile error.

* Replaces antaghud with customizable vision range for knowledge boon.

* Prevents a runtime if devil is gibbed while ascending.

* Neatens contract code, and removes excess variable from humans.

* Fixes compile errors

* Organizes weakness code slightly.  Adds ability for a species override on weakness.  (Make flypeople take 2x damage from flyswatters for example)

* Removes sixteen erroneous characters from the codebase.

* Removes trailing return

* Makes typeless for loops, removes a runtime, and removes unhelpful comments.
2016-05-08 18:44:27 +01:00
Nerd Lord
ff984ec0cc cleanup 2016-05-08 11:46:26 -04:00
paprika
28a8387b17 initial commit 2016-05-07 14:39:17 -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
KorPhaeron
1a18d00fe1 No more mindswapping with bosses 2016-04-30 02:22:43 -05:00
Jack Edge
8534e3dbb9 Code review 2016-04-24 16:29:17 +01:00
Jack Edge
c74ad4b708 Code review 2016-04-20 23:16:26 +01:00
Jack Edge
6e20f27240 Coding review fixes
- Removes trailing returns
- Removes mentioning code history in comments
- Uses built in features for cleanable decals
- Uses /obj/effect/dummy class to detect for incorporeal nature
2016-04-18 18:44:09 +01:00
Jack Edge
6cdbb1743d Removed etheral mute, bloodcrawl while phased 2016-04-18 17:43:34 +01:00
Jack Edge
f1ca391da4 Phasing and comments 2016-04-18 17:35:53 +01:00