3fc3d93744
Merge pull request #12940 from Shadowlight213/emotebanfix
...
Makes emote bans actually work
2015-11-11 17:35:19 +01:00
5e43d2b570
Merge pull request #12924 from Firecage/Optable
...
Changes the operating table to be an actual table.
2015-11-11 17:31:38 +01:00
b0c2e3e9c8
Merge pull request #12793 from PKPenguin321/patch-2
...
Adds surgery to remove surgically attached chainsaws
2015-11-10 23:25:51 -06:00
6de0264007
Merge pull request #12892 from tkdrg/fokkenhuds
...
Ghost HUD tweaks
2015-11-10 23:12:42 -06:00
0761e69856
Merge pull request #12946 from tkdrg/red_deity
...
Red deity fix
2015-11-10 23:07:07 -06:00
44cca62727
Merge pull request #12805 from KorPhaeron/xray
...
Xray range tweak
2015-11-10 18:14:47 -06:00
498cc918d5
Merge pull request #12944 from MrStonedOne/smartfridgerealfix
...
Fixes smartfridges once and for all.
2015-11-10 19:49:38 +00:00
9ce5334890
merge conflict fix
2015-11-10 18:44:10 +02:00
b4a9281a94
Merge pull request #12933 from Anonus/spookyscary
...
Revenant bugfixing
2015-11-10 07:52:58 +03:00
a63a1f1dea
Red deity fix
...
No longer shows red deity on check antags even when not HoG.
2015-11-10 00:00:24 -03:00
948ab822d2
Merge pull request #12930 from tkdrg/hoog
...
HoG fixes
2015-11-09 18:25:57 -06:00
c4fc8defec
HoG fixes
...
Fixes check antag when gods are dead.
Borging antags no longer announces removal of antag status.
Removes stun from Smite.
Fixes #12929
Fixes #12927
Fixes #12936
2015-11-09 19:54:07 -03:00
88eef20b69
Fixes smartfridges once and for all.
2015-11-09 14:35:16 -08:00
30550a5d1f
Merge pull request #12918 from duncathan/alwaysreturnparentplease
...
Makes cows, goats, and udders return ..() in Destroy()
2015-11-09 13:34:56 -06:00
3290a998fa
Makes emote bans actually work
2015-11-09 10:47:44 -08:00
7451acd893
Merge pull request #12925 from phil235/FridgeUnloadFix
...
Remove some debug message in smartfridge code.
2015-11-09 12:14:26 -06:00
3a8dc31e06
Merge pull request #12889 from tkdrg/andlettherebeSPEED
...
Improves speed of redraw_lighting()
2015-11-09 03:18:13 -03:00
d454eae1b1
Merge pull request #12916 from tkdrg/ripinpiss
...
Removes PDA chatrooms
2015-11-09 02:56:41 -03:00
eadbfc9b1c
Merge pull request #12915 from Shadowlight213/emoteban
...
Adds emote bans
2015-11-09 15:47:35 +11:00
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
d311183782
Fixes #12932
...
Also makes revenants use an update icon proc to update the icon based on what it's currently doing.
Also fixes a bug where using an ability could potentially lower your stun and reveal times.
2015-11-08 22:44:36 -05:00
88f64c607e
Ghost HUD tweaks
...
Removes links in tooltips. Makes alerts work as clicks when applicable.
Fixes #12843
Fixes #12844
2015-11-08 22:53:41 -03:00
e388b968a4
Merge pull request #12897 from KorPhaeron/harvester
...
Harvesters spawned by nar-sie are no longer culted
2015-11-08 21:45:02 +01:00
6c99bf6e71
Remove some debug message in smartfridge code.
2015-11-08 21:40:41 +01:00
8cd8d259ee
Merge pull request #11803 from RemieRichards/HandOfGod-Resurgence
...
Hand of God: Resurgence
2015-11-08 14:09:42 -06:00
b2937bf315
Changes the operating table to be an actual table.
2015-11-08 22:09:35 +02:00
0b75cd7bbd
makes milk-producers return properly in Destroy()
2015-11-08 00:35:51 -06:00
20fe2e4bb5
Removes PDA chatrooms
...
Nobody used them, and they were cluttering PDA Topic() needlessly.
Rest in peace, my child. You were too good for this world.
2015-11-07 23:51:48 -03:00
9fe0bdf583
Adds emote bans.
2015-11-07 18:32:35 -08:00
981dd378f4
Removes extra line
2015-11-07 14:59:18 -08:00
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
8814bdd8bf
Merge pull request #12827 from AndrewJacksonThe2nd/radio_icons_goofball
...
Makes sleepypens refillable
2015-11-07 14:40:40 -06:00
09a506ef0f
Merge pull request #12877 from KorPhaeron/insert_tf2_joke
...
Allows golems to wear hats
2015-11-07 14:33:00 -06:00
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
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
59e82d8e4b
Nar-Sie
2015-11-07 02:45:58 -06:00
af411525dc
Merge pull request #12841 from KorPhaeron/ui
...
Swaps Guardian HUD button locations
2015-11-07 08:06:42 +03:00
3553509936
Merge pull request #12855 from AnturK/abdfix
...
Fixes advanced camera resets.
2015-11-07 08:06:11 +03:00
c8a385e833
Merge pull request #12859 from Jalleo/RPGlootfix
...
Fixes rpgloot.dm by removing + and -
2015-11-07 08:05:52 +03:00
4c8f9303ce
Merge pull request #12848 from KorPhaeron/ghost_spawner
...
Ghost role spawners for mappers
2015-11-07 07:27:06 +03:00
25f36bd158
Merge pull request #12869 from Menshin/clean_ghost_hud
...
Made new_player mobs use the base Login() proc
2015-11-07 06:35:52 +03:00
9ee8faea73
Merge pull request #12552 from KorPhaeron/disposals
...
Click dragging mobs into disposals
2015-11-07 06:16:41 +03:00
4be1bfbbd2
Merge pull request #12603 from JJRcop/chronosuit_phase_better
...
New chronosuit teleport mechanics
2015-11-07 06:12:44 +03:00
5b1a2836fa
Merge pull request #12772 from Xhuis/shadowling_update_5
...
Shadowling Update V
2015-11-07 06:11:39 +03:00
01f50fe4ff
Merge pull request #12861 from phil235/FixGibMorph
...
Fixes gibbed morph not dropping items.
2015-11-07 06:09:20 +03:00
13b7de40e9
Merge pull request #12842 from Jalleo/Lifecleanup
...
Cleans up copy pasted…
2015-11-07 06:08:46 +03:00
5e9ef18dad
Merge pull request #12868 from phil235/BloodcrawlSlimeBugFix
...
Fixes slimes not being detached from their victim when the victim starts bloodcrawling.
2015-11-07 06:07:57 +03:00
5e736281a7
Merge pull request #12871 from YotaXP/origin_tech_fix
...
Fixed bad `origin_tech` values.
2015-11-07 06:06:48 +03:00
3308f76efb
Improves speed of redraw_lighting()
...
No longer uses animate() when unneeded, because animate() is slow.
Also turns Clamp() into a macro to reduce proccall overhead.
The whitespace changes in atmos are needed because of the way the
preprocessor handles macros.
Thank you MrPerson for helping with this.
2015-11-06 23:36:03 -03:00
0066670421
Merge pull request #12872 from Anonus/gtfoghost
...
Revenant Changes XVIII: You'd better be afraid of the ghost
2015-11-07 04:27:52 +03:00
phil235
duncathan salt
Cheridan
Remie Richards
Firecage
Razharas
Tkdrg
MrStonedOne
Shadowlight213
Aranclanos
Jordie
Nerd Lord
KorPhaeron