Commit Graph

368 Commits

Author SHA1 Message Date
MoreRobustThanYou c48def94d8 Removes gangs (#30056) 2017-08-31 17:31:49 -03:00
Jordan Brown 2778209f03 Move along 2017-08-31 15:32:33 -04:00
Xhuis d25c8228b4 Sanity checkin' 2017-08-30 22:22:45 -04:00
Ashe Higgs 6ba1506472 Revert "Revert "Rearranges the antagonist panel, cleans it up code-wise and appearance-wise (#30255)" (#30289)"
This reverts commit 34b39c6c01.
2017-08-30 15:12:59 -04:00
Jordan Brown 34b39c6c01 Revert "Rearranges the antagonist panel, cleans it up code-wise and appearance-wise (#30255)" (#30289)
This reverts commit 455cf37e52.
2017-08-30 12:17:59 -05:00
Ashe Higgs 455cf37e52 Rearranges the antagonist panel, cleans it up code-wise and appearance-wise (#30255)
* Makes the antag panel look fancier

* Get outta here

* it was either that or spend three hours

* now that's fancy!
2017-08-30 09:01:22 -04:00
Shadowlight213 e458845453 Adds tracking amount of time spent playing departments 2: The fall of the Assistants. (#29105)
* Ports Paradise Job exp system

* changed to use json_decode and json_encode as recommended by oranges

* updates changelog

* Reee cyberboss

* Changes to use a seperate table

* Updates database changelog
Changes to use mediumint

* Back to wip we go.
Changes sql stuff to how mso suggested
Attempts the changes requested in the other pr.

* work on stuff.

* work on stuff.

* Renamed proc for time remaining.
Fixed updating time amounts.
Added delay to fix firing at roundstart

* exp is now stored in a global list, and only updated to the db at round end.

* some stuff

* Added button to toggle exempt status on a player.
Still need to make it update the db

* REEE Jordie.
Undoes delaying exp updating to round end.
Adds the updating filtering to the update_exp_client proc which is used again

* Lowers a bunch of the times needed.

* Makes tracking per job instead of per department.
Department time is now calculated from job time.

* Whoops forgot to update master first. Lemme save this

Reverb should play cheeki breeki to people

* I think I did this right.
Too tired to test atm.
Busy rewatching twintails ni narimasu

* Removes var from proc arguments
Fixes database stuff

* Does some requested changes.
Makes special_role be tracked instead of bundled under special.

* Done, but need to refactor how it handles ghost roles.

* Less false data wew

* Changes

* Updates db version
More changes

* More changes

* More changes

* revision fix

* OOPS

* fix schemas

* Makes SQL error logging handled by Execute
Gang role tracking now strips out the gang name and is generic.
2017-08-20 23:01:08 +12:00
Jordan Brown a10f2f046b Adds a warning to the traitor panel for the last headrev (#29899)
* Adds a warning to the traitor panel for the last headrev

* Fax

* Fax more
2017-08-19 11:57:15 +12:00
Jordan Brown af4d9a85c9 Repaths /obj/item/weapon to /obj/item (#29929) 2017-08-16 10:38:51 -03:00
Jordan Brown d144c88fb5 Annihilates the colons! (#29812) 2017-08-15 12:49:35 -03:00
Jordan Brown 6175ab77d5 Removes all checks for subsystem existence 2017-08-01 10:16:37 -04:00
ShizCalev 0e9b3967e2 Spellchecks the map definitions (#29485) 2017-07-25 14:16:06 +12:00
ShizCalev 45d3d52af7 Made some object lists less terrible to read (#29304)
* spaces

* more spaces

* last ones
2017-07-18 10:44:29 -04:00
Fox McCloud 2cc3e9c41f Disease Refactor (#29130)
* Vomit Now Contains Viruses

* eh

* typeless memery

* Disease Refactor

* tweaks

* styling

* tweaks

* unecessary comment removal

* whoops

* fix
2017-07-15 11:08:40 -04:00
Really-Good-Soda-Flavor d23c6f910d Checks for temporary martial arts on mind transfer (#28746)
* Checks for temporary martial arts on mind transfer

* Makes transferring its own proc

* Makes sure martial arts are qdeleted on removal

* Improves teaching and removing
2017-07-04 11:34:05 +02:00
Mike Long 4185f8959f Fixes bugs in devil
Fixes devils not losing souls upon resurrection,.
Fixes spells appearing deactivated upon resurrection.
Fixes unascendable devils being able to get ascension grade spells.
2017-06-26 12:30:59 -04:00
nicbn 77a2d3f5cd Replaces "istype"s with is_helpers macros (#28676) 2017-06-22 15:03:19 -03:00
Jordan Brown 6aeaf4564a Fixes a documentation typo 2017-06-14 12:41:02 -04:00
kevinz000 703cff4953 Merge branch 'master' into gang_points_refactor 2017-06-06 08:48:51 -07:00
4DPlanner c7d8e5b5f7 Merge remote-tracking branch 'upstream/master' into datum - I genuinely
have no idea how this was a merge conflict and also fixes paren
2017-06-06 02:49:04 +01:00
4DPlanner 8a01762a75 Similar changes 2017-06-06 02:40:30 +01:00
4DPlanner dd9c858c3b Pidey recommended changes 2017-06-06 02:37:07 +01:00
Jordan Brown d7ebd649ba Refactors the latejoin list (#26647) 2017-06-04 17:07:46 -03:00
oranges 000865e7d9 wat (#28012) 2017-06-04 12:16:58 +02:00
kevinz000 7bde181832 gangboss 2017-06-02 02:28:31 -07:00
4DPlanner 53b341d1b4 Reflection hell 2017-06-01 22:34:19 +01:00
AnturK a1fa5be4a9 Fixes martial arts resetting on cloning. 2017-05-31 12:39:50 +02:00
4DPlanner 78cb889cad Moves equip_traitor to the mind, shuts down uplink on detraitor 2017-05-30 11:48:10 +01:00
4DPlanner 568e62f204 Properly wipes special role 2017-05-29 17:44:56 +01:00
4DPlanner 8cf533edca Removes duplication 2017-05-29 17:33:40 +01:00
4DPlanner dcaace7738 Pt 2 2017-05-28 18:42:00 +01:00
4DPlanner 65e45e543b I ONNA BREAK 2017-05-27 23:40:17 +01: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
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
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
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
AnturK 8c5e8cc4a9 Fixes #26973 2017-05-06 10:55:58 +02: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
oranges 846f31ca52 Merge pull request #26816 from lzimann/badgamemode
Removes the gang gamemode
2017-05-04 23:29:27 +12: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
Leo 89e60cb88f Changes a lot of ticker and ticker.mode checks to SSticker.hasRoundStarted (#26720) 2017-04-30 23:35:13 +02:00
Robustin 4103871708 Merge branch 'master' of https://github.com/tgstation/tgstation into CMA4
# Conflicts:
#	code/datums/antagonists/datum_cult.dm
#	code/game/gamemodes/cult/cult.dm
#	code/modules/mob/living/simple_animal/constructs.dm
#	icons/mob/actions.dmi
2017-04-30 16:36:36 -04:00