Commit Graph

2117 Commits

Author SHA1 Message Date
Yoshax
d2b229cb79 Merge pull request #2003 from Datraen/ApolloCookingPort
Port of Bay's Port of Apollo's Port of tgstation's Cooking System
2016-06-30 23:04:31 +01:00
Yoshax
4451081f37 Ensures post-start antag selection does not select banned people or ghosts or anything else it isn't meant to 2016-06-29 23:58:07 +01:00
Zuhayr
764c78b25f Ported and rewrote several cooking machines from Apollo by request.
# Conflicts:
#	maps/exodus/exodus-1.dmm
2016-06-29 13:59:24 -04:00
Richard D'angelo
7ab5220f64 510 Improved Overlays
Fixes auto blindness and no click on 510 servers, lessens the lag of
mesons and material scanners, and I suspect the general speed as well.

I only made it work for Polaris (and by extention, to our server, Eros),
and adapted it a bit.

Ported from:

7c2cc890ab
2016-06-18 15:50:10 -03:00
Yoshax
bd80894d35 Makes cult sword an actual sword 2016-06-17 21:51:12 +01:00
Yoshax
f75d509e7f Ports event system from Bay 2016-06-01 22:05:04 +01:00
Yoshax
1a203e131a Merge pull request #1792 from Neerti/5/28/2016_ling_changes
Some Changeling Changes
2016-05-30 13:53:18 +01:00
Neerti
3372d3ffee Some Changeling Changes
Bioelectrogenesis effectiveness can now be hindered by their gloves' electrical resistance.  Wearing insulated and making your hands create electricity won't be a good idea now.
Fake death is now much more real, inflicting the changeling with a large amount of oxygen damage, causing actual death, which fixes a lot of inconsistencies and bugs involving the game not checking for FAKEDEATH, as that is no longer needed with actual death.
The text received when obtaining the revive verb is now much larger, to make it easier to see.
Revival now undislocates all limbs.
Changes failure message received when you try to revive when absorbed to be consistent in style with other ling messages.
2016-05-29 21:47:50 -04:00
EmperorJon
5a545854a4 Underwear Datums (#1794)
* One more step to bringing our preferences/setup stuff in line with Bay.

* Whoopsy

* Jon is a moron, more at 11.
2016-05-29 17:29:36 +01:00
Yoshax
cd9fdd228b Merge branch 'master' of https://github.com/PolarisSS13/Polaris into attackcall 2016-05-28 20:22:09 +01:00
Mark9013100
8dc9d450ef Lowers revolution required players to 12 (#1692) 2016-05-18 21:15:26 -04:00
Neerti
174229f4b2 Perhaps fixes the revive bug. (#1691) 2016-05-18 20:41:21 -04:00
Arokha Sieyes
8e90199052 Generic Station & System Name
Makes the name of the starsystem and station generic such that it can be modified in global.dm and replace the strings where it is used. This won't have an effect on Polaris itself, but makes changing the name much more simple for forks. Using string concat constants on the advice of Psi.
2016-05-16 15:34:03 -04:00
Yoshax
e5b863de99 Changelings will now store and use the flavor text of their victims 2016-05-12 20:08:43 +01:00
Yoshax
fa8bb179bf Fixes #1586 2016-05-11 17:17:43 +01:00
Neerti
3dd6afe8af Merge pull request #1604 from silveryferret/no_roundstart_report
Removes the "Subversive Elements" Cent. Com. report at roundstart
2016-05-11 01:41:20 -04:00
silveryferret
a9c65176dd Removes the "Subversive Elements" Cent. Com. report
As title.
2016-05-09 09:45:53 -05:00
Yoshax
f9708a2e0e Swaps secret player count for ninja/wizard and ninja&wizard 2016-05-08 16:05:07 +01:00
silveryferret
e518ce53e6 Manifestcheck (#1543)
* Manifest Check

Adds a check for "Be Cultist" before summoning a manifest ghost
2016-05-04 13:36:41 -04:00
Datraen
f2b1b56243 Renegade cap changed, autotraitor added to mixed traitor renegade. (#1529) 2016-05-04 15:27:37 +01:00
Datraen
beda3185eb Reverts the second mob clean up because of incomplete implementation.
This caused an error that would then cause machinery to hang on the server, and was reproduced successfully.
2016-05-04 00:24:55 -04:00
Mark9013100
b8df470125 Punctuation fixes: Cult edition 2016-04-27 16:08:18 -04:00
HarpyEagle
3ae1f9ed78 Updates more instances of blocked<2 or /=(blocked+1)
Removes facehugger source code file
2016-04-22 21:04:31 -04:00
Jon
b779f721ae Moves antag text to antag levels. Changes renegade text from default to make it clear they're minor antagonists meant to resist the major ones. Changes ERT text to make it clear they're not antagonists (not that anyone ever comments on it, but that is what it says)... 2016-04-23 00:06:30 +01:00
mwerezak
4951790b50 Fixes missing cooldowns, missing cult blade sound.
Conflicts:
	code/game/objects/items/weapons/material/kitchen.dm
2016-04-22 04:58:25 -04:00
mwerezak
11c5b10bb9 Refactors various item attack() implementations
Replaced some attack() overrides with apply_hit_effect() or other attack
procs where appropriate.
Removed the attack() override from reagent_containers.

Conflicts:
	code/game/objects/items/weapons/clown_items.dm
	code/game/objects/items/weapons/material/kitchen.dm
	code/game/objects/items/weapons/stunbaton.dm
	code/modules/mob/living/carbon/human/human_defense.dm
	code/modules/mob/living/carbon/human/species/xenomorphs/alien_facehugger.dm
	code/modules/mob/living/simple_animal/friendly/spiderbot.dm
	code/modules/mob/living/simple_animal/simple_animal.dm
2016-04-22 04:57:22 -04:00
Kelenius
98badae45f Merge branch 'master' into cleanupTwo 2016-04-21 11:41:32 +03:00
Datraen
c24ba09834 Bumps up MercenaryRenegade gamemode requirement. 2016-04-19 13:05:05 -04:00
Datraen
a681213a02 Adds three new mixed modes! 2016-04-17 22:53:24 -04:00
Neerti
170fafcec7 Merge pull request #1432 from ParadoxSpace/FixesCult
Fixes Astral Journey Completely Destroying You
2016-04-17 20:41:05 -04:00
ParadoxSpace
5704a44bf8 saves us all
blessed be
2016-04-17 13:52:41 -06:00
Yoshax
85e900c9fe Fixes some gamemode names 2016-04-09 20:02:56 +01:00
Neerti
d9dd1221fc Merge pull request #1350 from Kelenius/lingFixes
Fixes ling transforms
2016-04-06 20:23:06 -04:00
Kelenius
aa3bcb6c26 Cultists no longer need to research words 2016-04-06 14:08:35 +03:00
Yoshax
2f95f98ec1 Adjusts secret game mode possibility formatting 2016-04-04 19:22:03 +01:00
Kelenius
2cfc6d7717 Fixes ling transforms
Lings transform name and species together
Ling always get languages from the DNA, be it by absorb, channel, or DNA
sting
Removed gender honorifics in lingchat because sometimes there's only one
female in the crew and it's easy to guess
2016-04-04 13:22:38 +03:00
Datraen
39e5834692 Lowers requirements for the new game modes. 2016-04-02 15:13:54 -04:00
Datraen
76ae987f2f Merge pull request #1233 from Neerti/3/23/2016_mostly_armblade_additions
Armblade Additions plus One Other Thing
2016-03-31 17:14:55 -04:00
Neerti
0aa252825a Armblade Additions plus One Other Thing
Armblades can now force depowered or broken airlocks, firelocks, and blast doors, just like a crowbar.
Armblades can slash APCs to cut all the wires.  Fixing the damage is as simple as mending all the wires.
Cleans up the fireaxe wielding check in airlock.dm
Removes colon cancer in blast_door.dm
Not armblade related: Self Respiration is now a free passive ability instead of costing one genome.
2016-03-31 16:39:10 -04:00
Neerti
396016becc Merge pull request #1247 from Yoshax/gamemodenames
Renames mixed gamemodes to have descriptive names
2016-03-30 02:22:32 -04:00
Anewbe
0ec85a0af6 Update cult_items.dm
Trying to fix a Travis thing.
2016-03-27 13:44:36 -05:00
Anewbe
c5228b1758 Balances Cult Hoods
- Gives Cult Hoods the same armor values as the robes
2016-03-27 13:29:33 -05:00
Yoshax
e26cb0f527 Changes lizard to use an & 2016-03-24 22:40:37 +00:00
Yoshax
99f8b37817 Renames mixed gamemodes to have descriptive names
Fixes intrigue gamemode name
2016-03-24 18:31:24 +00:00
Kelenius
df5a0d7941 Mob inventory cleanup
Replaces three item removal procs with one
Adds a proc to delete an item on the mob
2016-03-24 01:23:08 +03:00
Kelenius
e883863f4b Merge branch 'master' into playingWithTravis 2016-03-23 17:12:11 +03:00
Neerti
a9ad84da4b Merge pull request #1191 from Kelenius/inventoryCleanup
Mob inventory cleanup
2016-03-22 21:42:27 -04:00
Datraen
1a9d1e6f36 Merge pull request #1188 from Neerti/3/14/2016_changeling_additions
A large amount of changeling changes.
2016-03-21 14:12:09 -04:00
Kelenius
c615077568 Merge branch 'master' into oldTurrets 2016-03-21 11:32:26 +03:00
Datraen
fe9d3fd4c4 Merge pull request #1027 from Kelenius/mobCleanup
Changes types of ghosts and eyes
2016-03-18 13:50:47 -04:00