Commit Graph

3039 Commits

Author SHA1 Message Date
Joan Lung
8b912f84aa Fixes a bunch more cult bugs (#27034) 2017-05-08 13:17:40 -03: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
Joan Lung
eb1ae20bd4 Merge pull request #26762 from lzimann/cultshitandis
Fixes cult datum giving the action button to the mind instead of mob
2017-05-01 21:26:36 -04:00
Cyberboss
1ed59144bc Holocalls (#25743)
* Port holopads to Initialize

* Small optimization

* Holocalls

* What dunc said

* Revert "What dunc said"

This reverts commit dd9f26762aab86c3ce981fd7deab700299d4ed94.
2017-05-01 11:52:49 -06:00
Joan Lung
4a8fcdd395 Belligerent now prevents you from running even between chants (#25458)
* quick!

* Belligerent now prevents you from running even between chants

* one fuckup and git turns into a screaming hellspace populated only by pain

* glob

* seven seconds of pain
2017-05-01 11:48:55 -06:00
Leo
1e75ea5c98 Merge pull request #25603 from ChangelingRain/gainvanguard
Gaining Vanguard will remove existing stuns
2017-05-01 13:06:55 -03:00
Lzimann
b252232454 Mob override 2 2017-05-01 01:56:22 -03:00
Lzimann
653863f5d2 Mob override 2017-05-01 00:19:01 -03:00
Lzimann
dbdf2a7e3e Fixes cult datum giving the action button to the mind instead of mob. Also fixes trying to replace the mind instead of the body when the player is jobbaned. 2017-04-30 23:53:00 -03:00
Robustin
5a404bf4fe MFW Ive finished this PR 4 times now and its less functional then ever 2017-04-30 21:53:53 -04:00
bawhoppen
94d63eba9b Readds deepstorage w/ tweaks AND adds water bottles to vending machines (#26709) 2017-04-30 21:00:24 -03:00
Robustin
d372adea5e Update datum_cult.dm 2017-04-30 17:48:17 -04: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
bb78e731db How would you handle this LeoZ 2017-04-30 17:03:28 -04:00
Robustin
d42288763c LEEOOOOO 2017-04-30 16:55:02 -04: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
Robustin
4a4c2a498c Big finalized update 2017-04-30 16:30:35 -04:00
Joan Lung
37b25824d6 Merge pull request #26717 from lzimann/minddatum
Moves antag datums to the mind
2017-04-30 15:31:12 -04:00
Lzimann
66d186b61c Remove and apply innate effects are now applied when the mind is transfered to a new body 2017-04-30 16:21:45 -03:00
Joan Lung
920c2d00cc Status effects are actually deleted/handled when the mob is deleted (#26662) 2017-04-29 18:50:12 -03:00
Lzimann
acbf785544 Moves antag datums to the mind. 2017-04-29 16:33:09 -03:00
Profakos
e9eeadca1a Old ore processor cleanup (#26398)
* Processing machine cleanups, can smelt bluespace and titanium

* Another forceMove

* Lack of typing

* Rewrite using materials container, a target proc for container's release sheet procs

* Alloys

* The dme

* Nulls references on Destroy

* Makes the smelter infinitely large, like before
2017-04-29 20:45:32 +12:00
Leo
e803369fd9 Merge pull request #26634 from Core0verload/tochat_master_race
Changes some << to to_chat
2017-04-28 08:14:09 -03:00
Cyberboss
34e0e61e19 Adds a delete verb to the vv_drop_down (#26187) 2017-04-27 19:09:43 -03:00