Commit Graph

1551 Commits

Author SHA1 Message Date
Jordie
eadbfc9b1c Merge pull request #12915 from Shadowlight213/emoteban
Adds emote bans
2015-11-09 15:47:35 +11:00
Jordie
07464d1f10 Merge pull request #12911 from Shadowlight213/DbJobunban
Allows database based jobban lifting via the jobban panel
2015-11-09 15:47:10 +11:00
Shadowlight213
9fe0bdf583 Adds emote bans. 2015-11-07 18:32:35 -08:00
Shadowlight213
981dd378f4 Removes extra line 2015-11-07 14:59:18 -08:00
Shadowlight213
6a2f02fa47 Allows Database based jobbans to be lifted via the jobban panel.
Jobbans lifted this way take into effect the same round.
2015-11-07 14:57:08 -08:00
Tkdrg
8fce742d0a Merge remote-tracking branch 'upstream/master' into fuk
Conflicts:
	data/mode.txt
	icons/mob/mob.dmi
	icons/mob/suit.dmi
	icons/obj/clothing/gloves.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/shoes.dmi
	icons/obj/clothing/suits.dmi
2015-11-07 15:56:39 -03:00
Tkdrg
d966c37c6a Hand of God Fixes/Tweaks
Fixes healing fountain construction sprite.
Nexus are now destroyed properly.
Borged cultists will now lose antag status properly.
Round end message fixed.
Feedback messages improved to be clearer, and lots of typos fixed.
Smite no longer uses up faith if there is no valid target in the turf.
Adds an atom/attack_god() proc.
Fixes the greeting messages for prophets and followers, improves god msg.
Fixes nexus being spawned on dense turf after 2min, and general sanity.
Fixes attacking structures with abstract items.
Adds click delay and attack animation for attacking structures.
Fixes a lot more typos.
Fixes defense pylon friendly fire.
Makes defense pylon togglable on its god's click.
Cleans up gun_turret code a little in general.
Adds deconversion by loyalty implant or holy water (basically rev+cult).
Gods will now die when they have no followers left.
Adds the HoG gods to the traitor panel.
2015-11-07 15:25:28 -03:00
Shadowlight213
ef8598e7d1 Changes asay and dsay logging so they are seperate logging types. 2015-11-03 20:07:55 -08:00
Tkdrg
e2187614fd Merge remote-tracking branch 'upstream/master' into hog-mergeconflicts
Conflicts:
	code/__DEFINES/hud.dm
	code/__HELPERS/game.dm
	code/_onclick/hud/_defines.dm
	code/_onclick/hud/hud.dm
	code/game/gamemodes/antag_spawner.dm
	code/game/gamemodes/game_mode.dm
	code/game/machinery/turrets.dm
	code/modules/client/preferences_toggles.dm
	code/modules/events/alien_infestation.dm
	code/modules/mob/dead/observer/observer.dm
	code/modules/mob/living/carbon/alien/special/alien_embryo.dm
	code/modules/mob/living/simple_animal/revenant/revenant.dm
	icons/mob/back.dmi
	icons/mob/head.dmi
	icons/mob/hud.dmi
	icons/mob/inhands/items_lefthand.dmi
	icons/mob/inhands/items_righthand.dmi
	icons/mob/mob.dmi
	icons/mob/suit.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/items.dmi
	icons/obj/projectiles.dmi
	icons/obj/storage.dmi
2015-11-02 01:06:30 -03:00
Razharas
3951ccc3c3 Merge pull request #12771 from Jordie0608/totallyaspookyhalloweenchange
Removes ntsl investigate
2015-11-01 19:29:56 +03:00
Razharas
5ba4e04027 Merge pull request #12646 from Shadowlight213/OOCban
Adds the ability to ban someone from OOC
2015-11-01 15:43:55 +03:00
Jordie
5670780cac removes ntsl investigate 2015-10-31 15:06:49 +11:00
MrPerson
d575219887 Refactor mob movement delay calculation
Basic premise: Get all mob movement delays calculated in movement_delay() instead of having half of them in Client/Move(). Except for the slowdown from grabbing, which is so shit I can't even. The idea here is to eventually have the AI movements be at the same speed as client-initiated ones.

Let's try this again: Removes TickComp because it's a useless pile of shit that's based on a false idea of how BYOND's ticks and tile-based movement work.
2015-10-29 05:15:41 -07:00
Razharas
bf8cdc2896 Merge pull request #12627 from tkdrg/admin_antag_HUD
Adds Admin-only Antag HUDs
2015-10-26 03:57:07 +03:00
Cheridan
ed9b0c35c6 Merge pull request #12612 from phil235/BugFixBoogalooI
bugfixes: bloodcrawl, losebreath, wintercoat, and more
2015-10-25 14:19:11 -05:00
Shadowlight213
f52bb39674 Adds OOC banning 2015-10-25 00:45:48 -07:00
Tkdrg
35d09e7cc0 Adds Admin-only Antag HUDs
Togglable by a verb in the Admin tab. Only Rev, Cult, Ops and Shadowling
atm because the others don't have huds/have more than one hud and I'm
too lazy to handle it properly here. Also adds a debug verb for huds.
2015-10-24 02:53:38 -03:00
phil235
da84fcd8d2 - Fixes shadowling receiving burn messages even when dead. I've also fixed the same bug for other species and made certain spec_life() procs not run when the mob is dead. I also made slime species a subtype of jelly species since they had a lot of code in common thus reducing duplicate code.
- Fixes odd behavior with emagging airlock and windoor animation.
- Fixes being able to bloodcrawl in oil decal.
- Fixes being deaf after bloodcrawling.
- Fixes wintercoat hood appearing below the mask.
- Fixes being able to attack another mob before the game has started (and other things which used a gamestart check that no longer works).
- Ghosts can no longer become drones before the game has started.
- Removed "bhunger" and "ajourn" mob vars, they are unused.
- Fixes admin-revived morph being invisible.
- Fixes heart attack stacking losebreath very high. Also now losebreath is reset to 0 when the mob dies.
- All mobs no longer have a default strip menu showing two hands.
2015-10-23 20:00:52 +02:00
Jordie0608
0d67f24e33 Merge branch 'master' of https://github.com/tgstation/-tg-station into notallsyndicatescanaffordanukedonateyourstodayandyoucanhelpaspacestationbedestroyed
Conflicts:
	_maps/map_files/DiscStation/DiscStation.dmm
2015-10-23 01:01:02 +11:00
Jordie0608
1dee35a5f9 syndie nuke and closet mapped to shuttle 2015-10-21 18:27:29 +11:00
Jordie
01878098d1 local narrate to all mobs 2015-10-20 23:12:47 +11:00
Jordie
8a35115f1d Merge pull request #12493 from Shadowlight213/Banhancements
Adds alien jobbans and adds jobban and pref support to various events
2015-10-20 15:21:40 +11:00
Shadowlight213
3303a926fa Removes commented out code 2015-10-19 21:15:35 -07:00
Razharas
97554dd5ac Merge pull request #12443 from MrStonedOne/patch-48
adds resize to the list of fun required vars
2015-10-19 21:45:28 +03:00
Shadowlight213
9884a6624a Adds Shadowling bans 2015-10-18 16:20:58 -07:00
Shadowlight213
35ca96331e Adds jobban support to syndicate borg
Adds jobban and pref checking to various events
Adds support for alien jobbans
Adds feedback to alien infestation event.
2015-10-18 15:25:14 -07:00
Jordie0608
47dfb46f58 allows adding notes and watchlist for unknown ckeys 2015-10-18 20:48:13 +11:00
Kyle Spier-Swenson
66e435300d adds resize to the list of fun required vars 2015-10-16 12:24:18 -07:00
Cheridan
f56e012d87 Merge pull request #12331 from phil235/AdminTopicFix
Fixes some admin buttons in certain admin messages
2015-10-13 21:41:06 -05:00
phil235
7c6bbe328e Fixes some cases with mobs attached a mob. Can't enter a mech if attachment is done mid-climb. Can't get inside mech sleeper or closet if you have a mob attached to you. All sorts of teleports now properly teleport the attached mob as well.
Changed the warning message when climbing mech with a mob attached to be more general instead of specifically about slimes.

Getting inside a closet or machine now immediately breaks your pull and the pull of your puller.
Using ethereal jaunt now also immediately break your pull.

Fixes being able to get inside a mech sleeper while buckled by buckling mid-insertion.
2015-10-12 23:28:48 +02:00
Razharas
84a5511836 Merge pull request #12283 from KorPhaeron/inworld
Removes a bunch of in world
2015-10-12 12:12:35 +03:00
phil235
8daa8d9075 Fixes some admin buttons in certain admin messages ("move ferry" in the ferry request message, "adminmoreinfo", "antagonist" (to check antagonist) in player panel, 'list_signalers' button in transfer valve opening message).
Fixes Blue space artillery button in Centcom message, nuke code request message and syndicate message.
2015-10-12 02:03:31 +02:00
KorPhaeron
20e79ee109 Tweaks 2015-10-11 08:56:13 -05:00
Jordie0608
d19954dd6f stealthmin check for kick notification 2015-10-11 23:16:24 +11:00
Remie Richards
89b12e561f Merge pull request #12171 from Iamgoofball/patch-130
Kicks now inform you who kicked you.
2015-10-11 01:24:41 +01:00
KorPhaeron
31836a5deb Removes in world 2015-10-09 22:37:53 -05:00
Razharas
c884aa8243 Merge pull request #12233 from Jordie0608/iswearthewaythisevaluateskeepschanging
Misc fixes
2015-10-10 03:28:21 +03:00
Razharas
acbe87be22 Merge pull request #12186 from MrStonedOne/patch-46
Adds logging and admin announce to admin ghosting.
2015-10-10 03:16:05 +03:00
Jordie0608
477b389954 fixes adminonly evaluating as true always 2015-10-08 18:09:43 +11:00
Remie Richards
97de4b2ebe Merge branch 'master' of https://github.com/tgstation/-tg-station into HandOfGod-Resurgence
Conflicts:
	code/modules/mob/living/simple_animal/guardian/guardian.dm
	icons/mob/head.dmi
	icons/mob/suit.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/suits.dmi
	icons/obj/storage.dmi
2015-10-07 22:24:53 +01:00
Remie Richards
b9394257da About a million changes, but largely: Functional (Sort of) Antag Huds, Mind fixes, and Final glue to get the mode working. 2015-10-07 22:11:19 +01:00
Razharas
b8adf736a5 Merge pull request #12185 from MrStonedOne/patch-45
Removes admin announce and admin log from follow.
2015-10-07 22:15:10 +03:00
Razharas
0ad7257a52 Merge pull request #12089 from MrStonedOne/maprotation
HOLY FUCKING SHIT, I'VE DONE IT! Map rotation!
2015-10-07 07:53:42 +03:00
MrStonedOne
701e966f8f choosen -> chosen 2015-10-06 21:50:19 -07:00
MrStonedOne
1f7234d3bb adds prompt and logging to trigger map rotation verb 2015-10-06 21:20:35 -07:00
MrStonedOne
e27e9e8371 Map rotation fixes:
Fixes mutiple rotate operations from breaking the server, map rotation will properly detect rotation operations as well as update operations and abort.
Fixes max pop being treated as minpop
Adds more feedback to admin verbs.
2015-10-06 21:12:00 -07:00
Kyle Spier-Swenson
d1d7fb932c Adds logging and admin announce to admin ghosting. 2015-10-05 20:56:15 -07:00
Kyle Spier-Swenson
c1031a5a66 removes admin announce from follow.
This was only kept because it was the only easy way to claim an admin help.

Because starting to type a response to an admin help announces, this is no longer necessary
2015-10-05 20:48:07 -07:00
Razharas
070eb882db Merge pull request #12077 from GunHog/I_am_WJs_Code_Slave_Now
Royal Xeno Expansion!
2015-10-06 00:30:06 +03:00
Jordie0608
398a3ea1d1 unmagics polltypes into defines 2015-10-05 17:44:37 +11:00