Commit Graph

3061 Commits

Author SHA1 Message Date
Food b992136191 Resolve conflicts, change name. 2017-05-23 15:43:35 -04:00
Leo 13aa02f56d Merge pull request #27543 from AnturK/advanced_cam_fix
Fixes advanced cam not cleaning up properly
2017-05-23 15:43:22 -03:00
Cruix e95a2ac36b Replaced mob spawner vars with outfits (#27534) 2017-05-23 09:57:17 -03:00
Militaires 4e8281c35e refactors how vehicles use offsets + multiseat (#27265) 2017-05-23 00:48:45 -03:00
ShizCalev 82d5e8a51a Area Refactor + Var-edit Cleanup (#27530) 2017-05-23 00:07:48 -03:00
AnturK c883a737e4 Fixes advanced cam not cleaning up properly 2017-05-22 17:29:39 +02:00
Really-Good-Soda-Flavor 41294bd58d Reorganizes martial arts and stores them in the MIND. (#27324)
* Reorganizes martial arts and stores them in the MIND.

* Moves martial arts to mind.

* Added more sanity checks

* MORE sanity checks!

* Fixes the checks.
2017-05-22 14:12:27 +02:00
Food e961199fdb Initial beach-language commit 2017-05-21 21:49:32 -04:00
Joan Lung 0fb07d0f5a Proto-kinetic crushers are significantly better (#27379) 2017-05-20 14:41:19 -03:00
AnturK 4294e92f62 Fixes some holocall issues (#27369)
* Fixes some holocall issues

* Actually this is fine.

* Notifies on holocall start
2017-05-18 10:31:29 -06:00
Mike Long 0c79d3ff8e Ninja Refactor (#27316)
* Begins converting Ninjas into the new antagonist datum system.  Does not compile.  Work in progress.

* More work towards datumizing ninjas. Still not finished. Now compiles.

* Adds ninja to traitor panel.

* Add objectives now takes an arg for number of objectives.

* Event now actually ninjas the ninja.

* Ninja suit initialization now works.

* Cleans up the suit initialization code some.

* Suit initialization is now action rather than verb based.

* Now properly adds objectives and memories to the mind upon gaining datum.

* Starts to replace ninja verbs with actions.

* Hooks ninja abilities up to action buttons.

* Whoops, missed a verb.  Gloves are next.

* Adds toggle ineraction type action button.

* Changes icons as per ChanglingRain's suggestions.

* Second round of changes for ChanglingRain

* Replaces sleeps with addtimers.  It's ugly, but more CPU efficient.

* Fixes compile errors.

* Fixes compile error, again.
2017-05-18 10:21:26 -06:00
QualityVan d66c68cb35 Fixes uplink pens in traitor menu (#27340) 2017-05-18 09:49:30 +02:00
Joan Lung 1b7c4a63dc Repaths /obj/effect/overlay/temp to /obj/effect/temp_visual (#27344) 2017-05-17 22:54:54 -05:00
Joan Lung 15cd77d3ae Manifest Spirit is better for summoning cannon fodder but slightly worse for instantly summoning Nar-Sie (#27104) 2017-05-11 22:38:21 -03:00
Cyberboss 24958ab3ff Hopefully fixes a holocall runtime 2017-05-10 09:25:23 -04:00
Mike Long 4687dd0117 Devil refactor+small revamp (#26815)
Hello, with PR #26717 merged, I think it's a good time to add devils to the standardized antag datum system.

This PR is mostly a refactor, which shouldn't be noticed by the playerbase. Changes that might be noticed are below.

🆑
tweak: Modified chances for returning someone's soul using an employment contract. Now everyone has a chance, not just lawyers and HoP.
add: Particularly brain damaged people can no longer sign infernal contracts properly.
tweak: Infernal contracts for power no longer give fireball, and instead give robeless 'lightning bolt' spell.
add: Devils can now sell you a friend, for the cost of your soul.
tweak: The codex gigas should now be easier to use, and less finicky.
del: The codex gigas no longer sintouches readers.
/🆑
2017-05-10 22:02:17 +12:00
MMMiracles c98ca85fb4 Cerestation Tweaks VI: Shuttle Edition (#27045)
* Added a new escape shuttle design for Cerestation. Holds over 80 people with several fully-stocked sub-departments for people to kill themselves with at the end of the round.
* Added a new white shuttle design for Cerestation. Meant mostly as a cargo vessel for transporting materials during the station's construction. Comes with a spawner that has a 75% chance to spawn ripley wreckage or 25% chance to spawn a fully-equipped ripley.
2017-05-09 12:39:13 -03:00
Leo 6aed77cbfe Merge pull request #27069 from Cyberboss/patch-68
Commit hash in rev data is now shortened
2017-05-09 11:48:30 -03:00
Leo 1f9ca148c5 Merge pull request #27053 from Penguaro/shuttlename
Adjusts Meteor Shuttle name for grammar
2017-05-08 19:50:11 -03:00
Joan Lung 8b912f84aa Fixes a bunch more cult bugs (#27034) 2017-05-08 13:17:40 -03:00
Cyberboss 8a50adefdf Fix 2017-05-08 10:41:03 -04:00
Cyberboss 9d64a52d5a Commit hash in rev data is now shortened 2017-05-08 09:57:45 -04:00
Mr Potato Shaman b2bea58273 Now Beepsky's impact will be grammatically correct. 2017-05-07 17:02:37 -05:00
Joan Lung 5ce91a8230 Cultists of Nar-sie have their own language (#26952) 2017-05-07 08:06:38 -03:00
Joan Lung 74f00e629f Cult fixes (#26990)
* Cult fixes

* ha ha whoops

* whoooops

* whoops x3 combo
2017-05-07 00:51:40 -03:00
Leo 30eb129000 Merge pull request #26943 from Cyberboss/c4Remove
Repaths C4
2017-05-06 15:48:35 -03:00
Joan Lung f17dd48f94 Merge pull request #26631 from Robustin/CultMasterAttempt2
2017 Cult Overhaul P1:  Cult Master and Datum Cult
2017-05-06 12:55:50 -04:00
Joan Lung 1f10a84846 Merge pull request #26921 from 4dplanner/iaa
Internal affairs upgrades [READY]
2017-05-06 11:15:33 -04:00
coiax a70e0f1ad5 Seed vault lavaland ruin can only spawn once (#26934)
🆑 coiax
tweak: The lavaland Seed Vault ruin can spawn only once.
/🆑

I don't think more than 4 people will want to be pod people, it's
digging in our precious ruin budget.
2017-05-06 10:08:51 -03:00
AnturK 8c5e8cc4a9 Fixes #26973 2017-05-06 10:55:58 +02:00
4DPlanner 2e28336955 Updates to use status effects, turns off debug population settings 2017-05-06 03:57:09 +01:00
Cyberboss 74c0756e28 Repaths C4 2017-05-05 13:23:45 -04:00
Leo bad146cc9c Merge pull request #26896 from Cyberboss/patch-72
Fixes answering a holocall not disconnecting other calls
2017-05-05 12:27:39 -03:00
coiax b633cd6ba2 Moves languages to a holder datum, gives mind its own language holder (#26776)
* Ghosts now have a language menu

🆑 coiax
add: Ghosts can now modify their own understood languages with the
language menu.
/🆑

- Language menu is now on /atom/movable, and can be opened by any atom
with the `open_language_menu` proc.
- Used for testing, and simulating what various station members hear.

* Language holders, I

* Language holder, II

* Dos line endings

* MIND LANGUAGES

* Fixes some mobs not having language holders in their minds

* Shadow languages

* How did you lose the holder?

* Mob level IC->Open Language Menu verb

* Gives draconic to silicons

* Lazy breeki

* Use of pre-initialized global lists for languages

* Fixes bugs with lazy holders
2017-05-05 15:12:27 +02:00
PKPenguin321 c2bfa07473 Revert "Removes the gang gamemode" (#26915) 2017-05-04 21:19:02 -05:00
Robustin 94cd7abce3 Merge branch 'master' into CultMasterAttempt2 2017-05-04 10:41:40 -04:00
Cyberboss 34d1e7eb59 Fixes answering a holocall not disconnecting other calls 2017-05-04 09:43:04 -04:00
oranges 846f31ca52 Merge pull request #26816 from lzimann/badgamemode
Removes the gang gamemode
2017-05-04 23:29:27 +12:00
Joan Lung 1234425e0a Mania Motors now do minor damage and continue to affect targets after they leave its range (#26783)
* Mania Motors now do minor damage and continue to affect targets after they leave its range
2017-05-04 00:15:16 -05:00
Robustin 32571d7d3e wew 2017-05-03 21:26:38 -04:00
Robustin b4e347f940 Always forgetting the /proc/ 2017-05-03 20:25:40 -04:00
Robustin c9f26ef55c Update buffs.dm 2017-05-03 20:21:59 -04:00
Robustin ad19802a6d fucking hell im so done with this PR 2017-05-03 20:03:43 -04:00
Robustin 5a98d90b5c Merge branch 'master' of https://github.com/tgstation/-tg-station into CMA6
# Conflicts:
#	code/datums/antagonists/datum_cult.dm
2017-05-03 12:28:16 -04:00
Joan Lung 6c303855e8 Should fix all of the cult/clockcult issues (#26832) 2017-05-02 22:43:34 -03:00
Robustin 3423cbeba5 Finally working again 2017-05-02 19:25:49 -04:00
Mike Long f9afd1ad5b Removes vestigial list from minds. (#26771) 2017-05-02 14:47:03 -03:00
Lzimann 59eed8f11c Removes the gang gamemode 2017-05-02 14:28:55 -03:00
Leo 3b9b4e0755 Changes a bunch of hrefs to the proper defines (#26760) 2017-05-02 01:19:51 -06:00
Joan Lung 4d17c4fad2 Fixes cult and clockcult icons 2017-05-01 21:45:57 -04:00