7451acd893
Merge pull request #12925 from phil235/FridgeUnloadFix
...
Remove some debug message in smartfridge code.
2015-11-09 12:14:26 -06:00
780dfe8db1
Ridiculous weapons
2015-11-09 07:17:10 -06:00
21c6e50ee3
Custom emitters
2015-11-09 05:45:31 -06:00
130ab1f4cb
Merge remote-tracking branch 'refs/remotes/tgstation/master' into jobbans
...
Conflicts:
code/game/gamemodes/game_mode.dm
2015-11-09 00:29:41 -06:00
3a8dc31e06
Merge pull request #12889 from tkdrg/andlettherebeSPEED
...
Improves speed of redraw_lighting()
2015-11-09 03:18:13 -03:00
424d33b365
Merge pull request #12890 from Xhuis/balance_patch
...
Miscellaneous balance changes
2015-11-09 03:16:38 -03:00
998bcb3aed
Makes fixes Jordie totally didn't do himself
2015-11-08 23:15:38 -07:00
d454eae1b1
Merge pull request #12916 from tkdrg/ripinpiss
...
Removes PDA chatrooms
2015-11-09 02:56:41 -03:00
d80a56cde1
Revert "STUN NERF"
...
This reverts commit 1b8c9ea2cb
2015-11-08 21:17:50 -08:00
eaa1d11af4
On stun_nerf: objectives
2015-11-08 21:10:21 -08: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
97697bcac4
Makes the lich beam dark green, and thus much more spooky.
2015-11-08 20:31:54 -05:00
1bdc187db6
fixes bug that kept hotspots from GCing and prevented hotspots from entering a recently hotspotted turf
2015-11-08 15:25:02 -08: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
47e7046fe4
Adds the ability to use Saline-Glucose Solution as an IV drip to restore blood. It is more effective when blood is lower.
2015-11-08 11:53:07 -05:00
465c71c45e
More Hand of God updates:
...
* Prophet2God communication
* Cancel structure construction
* New Construction/Trap UI
* Reduced structure costs
* Structure conversion
* Prophet gear
* Removes holy slumber for being OP
2015-11-08 16:00:14 +00:00
c3cdb96b68
Update _logging.dm
2015-11-08 01:16:06 -08: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
ece4f4544e
No RCD
2015-11-07 20:13:07 -06:00
5319d904e3
Lava
2015-11-07 20:07:24 -06:00
e624574c65
Ports action figures pew pew pew
2015-11-07 18:40:45 -07: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
f8aba56a96
Better comment
2015-11-07 16:55:09 -06:00
4ef3a9332a
Mob name fix
2015-11-07 16:51:31 -06:00
7c64602766
fixes the captain being a worm(spelling error).
2015-11-07 14:18:08 -08:00
44e1b2d264
forgot some nerfs
2015-11-07 12:47:28 -08:00
8814bdd8bf
Merge pull request #12827 from AndrewJacksonThe2nd/radio_icons_goofball
...
Makes sleepypens refillable
2015-11-07 14:40:40 -06:00
1b8c9ea2cb
STUN NERF
2015-11-07 12:37:38 -08:00
09a506ef0f
Merge pull request #12877 from KorPhaeron/insert_tf2_joke
...
Allows golems to wear hats
2015-11-07 14:33:00 -06:00
284ad97289
Merge branch 'master' of https://github.com/tgstation/-tg-station into action_action_action_action_action
...
Conflicts:
icons/mob/actions.dmi
2015-11-07 14:30:31 -05:00
a88b5d797c
*adds action buttons for slimes
...
*technically obsoletes the slime tab, but I left it in just in case anyone prefers it.
2015-11-07 14:24:48 -05: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
ba4cb7a565
Laserbox
2015-11-07 04:22:30 -06:00
3c03fa9b24
Makes cloaks into exosuit items. Modifies their armor values so they decent replacement for existing head of staff exosuit items. Compiles this time, I promise.
2015-11-07 01:31:57 -08:00
7b7a3cfd53
puts the new exosuit head of staff cloaks in their lockers. This time for real.
2015-11-07 01:28:44 -08: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
Cheridan
KorPhaeron
Aranclanos
NikNakFlak
AndrewJacksonThe2nd
Jordie
Nerd Lord
Tkdrg
MrStonedOne
phil235
Firecage
Mike Long
Remie Richards
duncathan salt
Shadowlight213
KorPhaeron
TechnoAlchemist
Incoming
Razharas