Commit Graph

2490 Commits

Author SHA1 Message Date
SinTwo
c1bd0aa6b4 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into item_state
Conflicts:
	code/modules/clothing/clothing.dm
2016-07-19 17:37:14 -04:00
Neerti
e1e0933657 More Technomancer Work
Adds two new spells;
Track: which functions similarly to a pinpointer for technomancer objects and apprentices.  With a scepter, it will be able to track anyone as well.
Targeting Matrix: which assists in targeting with whatever is in your off-hand, for a price in instability and energy per shot.
Adds Gloves of Regeneration, which passively trades healing for hunger, as well as stabbing your hands with needles.  They also insulate your hands.
Adds Boots of Speed, which act as no-slips and make the wearer run slightly faster than normal.
Adds the new gun sounds to Audible Deception.
2016-07-18 22:03:02 -04:00
Neerti
b93bf797f4 Some More Technomancer Additions
Adds the Recycling and Summoner cores to the catalog, which I somehow forgot to do earlier.
Adds an instability modifer for different cores.
Adds several new healing spells, for dealing with internal organ troubles, as well as for dealing with robotic FBP healing.
Makes various healing spells cheaper in the catalog.
2016-07-15 12:18:31 -04:00
Anewbe
0325a2a5e6 Fixes a spelling mistake 2016-07-13 18:27:00 -05:00
Anewbe
bc1d661ae8 Adds icons to the ling HUD 2016-07-13 18:05:46 -05:00
SinTwo
976847a0b4 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into item_state
Conflicts:
	code/modules/clothing/head/jobs.dm
	icons/mob/items/lefthand.dmi
	icons/mob/items/righthand.dmi
	icons/mob/suit.dmi
	icons/mob/uniform.dmi
	icons/obj/items.dmi
2016-07-13 17:07:52 -04:00
SinTwo
7192bf08fd item_state cleanup 2016-07-11 22:31:32 -04:00
Anewbe
efc20b7108 Anatomic Panacea clears ingested reagents 2016-07-10 03:39:51 -05:00
Yoshax
e28c4361f7 Merge pull request #2015 from Neerti/12/16/2015_newwizard
Dry-dock phase for Technomancer
2016-07-10 03:43:35 +01:00
Anewbe
f27fa6cc2b Adds a pry var to objects, which checks if the obj can open doors 2016-07-09 00:24:12 -05:00
Anewbe
114dfcdff8 Fixes the Ling bug 2016-07-08 22:00:57 -05:00
Neerti
61e291a083 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 12/16/2015_newwizard 2016-07-08 21:00:12 -04:00
Neerti
8a61641479 Some more work + prep for drydocking. 2016-07-08 20:38:34 -04:00
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
Neerti
20a3bd5b26 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 12/16/2015_newwizard 2016-06-26 20:14:29 -04:00
Neerti
53d60eb554 Does even more work.
NOTE: asphyxiation is broken!
2016-06-23 05:21:04 -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