4962fefc02
Merge pull request #12882 from tgstation/RemieRichards-AutolatheThingy
...
Items can now react to being constructed by autolathes
2015-11-11 10:43:28 -06:00
497464c3d2
Merge pull request #12831 from MMMiracles/idedplsnerf
...
nerfs water
2015-11-11 10:40:49 -06:00
686366fe98
Revert "Makes mechs use some of pilot huds (job,wanted,loyalty,antag)"
2015-11-11 17:39:42 +01:00
d0f5ecd55c
Merge pull request #12795 from KorPhaeron/jobbans
...
Attempting to convert a jobbaned player offers control of their mob to ghosts
2015-11-11 10:36:35 -06:00
9339662a28
Merge pull request #12768 from xxalpha/windows10
...
Made it possible to paint windows to make them opaque.
2015-11-11 10:32:18 -06: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
d82010caf3
Makes injectors timed
...
Update
Lowers the scanner buffer transfer radiation.
Makes injector duration scale with upgrades.
Time coefficent values
2015-11-11 17:27:55 +01:00
b44715cff8
2 instead of 1
...
water is still dumb
2015-11-11 10:33:36 -05:00
79d25ef2d9
Fixes remotely detonating planted c4 with signaler.
...
Move CanUseTopic() procs to the correct files.
2015-11-11 15:57:05 +01:00
e5f8c3f941
Merge pull request #12900 from KorPhaeron/laserbox
...
Immovable reflectors for admins/mappers
2015-11-10 23:21:20 -06:00
6de0264007
Merge pull request #12892 from tkdrg/fokkenhuds
...
Ghost HUD tweaks
2015-11-10 23:12:42 -06:00
7493326f61
More edits, woop.
2015-11-10 22:08:51 -05:00
c8391680a6
So I must bury it.
2015-11-10 23:46:17 +00:00
af74475cad
Because I cannot bear it.
2015-11-10 23:41:59 +00:00
359bdf7e5e
Adding a new away mission, WIP.
2015-11-10 18:18:07 -05:00
a28404eeff
Merge pull request #12769 from PKPenguin321/patch-1
...
Makes lubed floors have the wet overlay, take two
2015-11-10 16:53:19 -06:00
102ee66c69
Updating one comment
2015-11-10 22:42:17 +01:00
db67825974
Fixes being able to stun AI and MMI forever with flashbang, preventing them from using their mech. Brain mobs can no longer get flashed or flashbanged. Silicons are no longer affected by the sound bang of the flashbang (since they have no ears).
...
Fixes a runtime with two blob reagents.
Fixes a reference not being removed when hydro tray is destroyed.
Laser pointer can no longer weaken AIs (no eyes).
2015-11-10 22:06:54 +01:00
9ce5334890
merge conflict fix
2015-11-10 18:44:10 +02:00
d1d693b4bb
Announcements made by AIs have their name attached
...
For example, it will use LIES Announces: of the generic "Attention" header.
2015-11-10 09:24:15 -07:00
618e54087d
Makes abductor Optables not deconstructable.
2015-11-10 17:21:12 +02:00
5f2ed41bc6
Merge pull request #12873 from KorPhaeron/zipties
...
Captain and HoP lockers now contain zipties
2015-11-10 08:03:53 -06:00
c76a9526d5
Adds a Syringe to the Uplink Poison/Chemical kit
...
Useful for:
1: Poisoning food.
2: Injecting Chemicals directly rather than being forced to feed someone
from a bottle.
2015-11-09 19:57:28 -06: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
43583d37b8
Merge pull request #12912 from Niknakflak/FigureToys
...
Ports action figures
2015-11-09 13:11:16 -06:00
780dfe8db1
Ridiculous weapons
2015-11-09 07:17:10 -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
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
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
b2937bf315
Changes the operating table to be an actual table.
2015-11-08 22:09:35 +02: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
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
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
1b8c9ea2cb
STUN NERF
2015-11-07 12:37:38 -08: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
7b7a3cfd53
puts the new exosuit head of staff cloaks in their lockers. This time for real.
2015-11-07 01:28:44 -08:00
3553509936
Merge pull request #12855 from AnturK/abdfix
...
Fixes advanced camera resets.
2015-11-07 08:06:11 +03:00
1c0b434997
Balance changes
2015-11-06 22:16:04 -05:00
58cecbfb3a
Merge pull request #12561 from phil235/ChemistryManual
...
Adds a chemistry manual.
2015-11-07 06:12:58 +03:00
5b1a2836fa
Merge pull request #12772 from Xhuis/shadowling_update_5
...
Shadowling Update V
2015-11-07 06:11:39 +03:00
db672c359e
Merge pull request #12834 from Incoming5643/supermatter_sword
...
Supermatter sword fixes
2015-11-07 06:09:26 +03:00
duncathan salt
AnturK
phil235
MMMiracles
CosmicScientist
Cheridan
Firecage
Ikarrus
Torger597
Tkdrg
KorPhaeron
Aranclanos
NikNakFlak
AndrewJacksonThe2nd
Remie Richards
KorPhaeron
TechnoAlchemist
Razharas
Xhuis