Commit Graph

291 Commits

Author SHA1 Message Date
Joan Lung
9c93fb8b59 Removes the mob "memory" var (#20814)
* Removes the mob "memory" var

* MEMERY
2016-10-10 11:46:52 +13:00
Joan Lung
306313af52 Player simple animals no longer count as traitors (#20835) 2016-10-10 11:30:45 +13:00
Joan Lung
d5a9a5fd77 who's mind? (#20834) 2016-10-09 17:19:41 -05:00
Joan Lung
b5b4037e2e More istypes replaced with helpers (#20767)
* shouldn't you be merging these by now

* my oh my do we have a lot of these

* a fellow pedantic shit
2016-10-03 13:40:13 +13:00
Joan Lung
dd9a3e9c9a did I actually test anything? 2016-10-01 14:47:42 -04:00
Joan Lung
dff4db726a Replaces a bunch of istypes with their proper macros (#20739)
* Replaces a bunch of istypes with their proper macros

* i'm not sure doing a 100+ file changed pr on a whim is something you do when bored
especially if you do it by hand because you never actually learned the regex that would let you automate it

* i'm just... gonna do this, because that check was true a lot and it shouldn't matter
2016-09-30 20:21:08 +02:00
Joan Lung
d41971d7ed Merge branch 'master' of https://github.com/tgstation/tgstation into proofofconceptantagdatum
Conflicts:
	code/game/gamemodes/game_mode.dm
2016-09-20 19:03:20 -04:00
Joan Lung
5ac7e1b68d cult too! 2016-09-19 19:44:58 -04:00
Joan Lung
70f5419838 this is a style change 2016-09-19 13:12:46 -04:00
Joan Lung
3ec7e81131 "A Working Datum Antagonist" 2016-09-19 13:03:22 -04:00
AnturK
93f444fd38 Removes Hand of God gamemode. 2016-09-18 13:32:26 +02:00
Joan Lung
0f3031bd7e Fixes some potential weird faction bugs 2016-09-02 16:51:26 -04:00
KorPhaeron
08863597ab Typo 2016-08-28 13:31:53 -05:00
KorPhaeron
f6aa045e97 Fixes reinforcement runtime 2016-08-28 13:31:05 -05:00
Joan Lung
61cff4e7bc Merge pull request #19940 from KorPhaeron/summons
Summon Magic now functions like summon guns
2016-08-18 22:31:02 -04:00
KorPhaeron
f3200ee88a Summon Magic 2016-08-17 19:33:32 -05:00
oranges
e92908ff36 Merge pull request #19893 from ChangelingRain/makeandreshapeintotheselfyouwanttobeandifyoudontknowwhatyouwanttobefindout
Makes the traitor panel a little less fucked up
2016-08-17 10:11:51 +12:00
Cheridan
643192e75d Merge pull request #19884 from ChangelingRain/ipourmyselfintoeverythingillforgetbecauseifimgoingtoforgetititshouldbegoodenoughtoremember
Revenants now spawn
2016-08-15 14:59:13 -05:00
Joan Lung
d7e8439e6a Makes the traitor panel a little less fucked up 2016-08-14 21:06:10 -04:00
Joan Lung
79c6be3cf4 Revenants now spawn 2016-08-14 13:56:30 -04:00
KorPhaeron
b5b62d6407 Refactors slaving created mobs minds 2016-08-12 19:20:27 -05:00
lordpidey
d923e16044 Adds "law 666" for cyborg devils. (#19646)
* Adds "law 666" for robot devils.

* Minor refactors for Remie

* Fixes compile error.

* I'm an idiot.
2016-08-03 10:18:37 +12:00
lordpidey
ec2f666f29 Devil agent (#19391)
add: Added Devil agent gamemode, where multiple devils are each trying to buy more souls than the next in line.
add: If you've already sold your soul, you can sell it again to a different devil. You can even go back and forth for INFINITE POWER.

This adds a new gamemode. Devil Agent. It works much like Double Agent, except devils instead of traitors, and instead of killing, the devil simply has to control more souls than the enemy.

Also, whether this is included in the rotation depends on the config settings. By default, it will be disabled.
2016-07-31 17:02:21 +12:00
Rui Neves Carvalho
7264688196 Fixes admins not being able to make a redgod. (#19538) 2016-07-28 11:05:21 -04: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
Xhuis
8a852f196b Removes shadowling (#18951) 2016-06-27 20:53:35 -04:00
oranges
3a7eab6e05 Merge pull request #18729 from coiax/remove-spawn-3
Remove spawn III
2016-06-21 20:11:08 +12:00
Jack Edge
821b3bc1b3 More spawn removal 2016-06-19 01:50:58 +01:00
AnturK
f14b81fdfd Fixes #18271 2016-06-18 15:02:32 +02:00
Joan Lung
4f8133c3d1 unfucks ratvar conversion 2016-06-08 15:50:06 -04:00
Xhuis
d7c09927fa Fixes an issue with golems and conversion 2016-05-29 03:43:39 -04:00
Cheridan
92d1ae5a4b Merge pull request #17881 from coiax/time-of-death
Polymorph bugs, time since death, groundwork laid
2016-05-25 01:29:44 -05:00
Jack Edge
afd9720abc Polymorph bugs, time since death, groundwork laid
🆑 coiax
fix: Fixes bug where bolt of change to the host would kill an attached
guardian.
fix: Fixes bug where bolt of change to laughter demon would not release
its friends.
fix: Fixes bug where bolt of change to morphling would not release its
contents.
fix: Fixes bug where bolt of change transforming someone into a drone
would not give them hacked laws and vision.
rscadd: Medical scanners now inform the user if the dead subject is
within the (currently) 120 second defib window.
/🆑

- Also laid the groundwork for force pushing ghosts back into bodies
when defibbing, along with standardising the ghost back into body
process.
- Defib limit and defib brain loss times are now #defines.
2016-05-24 17:28:34 +01:00
Xhuis
8b8d0b66e6 Conflicts II 2016-05-18 17:52:04 -04:00
Robustin
f02fb50825 Adds Hivemind Link (#17618)
Adds Hivemind Link ability to changelings
2016-05-17 20:42:44 +01:00
Xhuis
b93957e6ca Pre-testmerge polish 2016-05-15 13:15:27 -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
0897f3bc20 Cult communication is now innate and has an action button 2016-05-02 09:11:06 -04:00
Lzimann
381c7e605c Some HoG tweaks
- Automatic nexus placing time changed to 15 minutes(from 2)
- Follow button for divine telepathy for ghosts
- Divine telepathy's color is now God's color.
- Prophet's gear(hat and staff) prioritizes the backpack instead of automatically equipping.
- CTF spawn protection trap is no longer constructable
- Added follow buttons in check antag panel(admins)
- Changed the order of traitor panel for HoG
2016-04-30 00:42:09 -03:00
Isratosh
75b350561a Adding a second argument to mind.transfer_to that forces key movement and fixing rudimentary transformation 2016-04-01 01:32:59 -06:00
Mike Long
27e781e3cf Corrected mistake. It now works with changelings too. 2016-03-05 03:12:00 -05:00
Mike Long
12f4d11f7e Adds antag hud for traitors/changlings/abductors/abductees/ninjas
Right now, it's admin only.

Has not been tested.
2016-03-05 00:52:59 -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
phil235
563ef0cca8 Renamed remove_spell() to RemoveSpell() for consistency with AddSpell(). 2016-02-29 23:21:33 +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
f79b7bafcb Various fixes. 2016-02-27 18:30:32 -08:00
Shadowlight213
642321b5cd Removes newcult and readds oldcult 2016-02-27 00:53:14 -08: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
Firecage
d2bd6871d5 Merge Conflict Fix 2016-01-20 14:07:14 +02:00