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
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
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
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
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
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
b2937bf315
Changes the operating table to be an actual table.
2015-11-08 22:09:35 +02: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
e624574c65
Ports action figures pew pew pew
2015-11-07 18:40:45 -07: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
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
db672c359e
Merge pull request #12834 from Incoming5643/supermatter_sword
...
Supermatter sword fixes
2015-11-07 06:09:26 +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
f332f595a2
zip ties
2015-11-05 18:03:12 -06:00
0f23809346
Revenant changes XVIII
...
Made the abilities easier to tweak and somewhat less copypasta. They're still for() loops though.
Check the changelog for additional details.
2015-11-05 18:50:51 -05:00
2ffc5f055c
Fixed bad origin_tech values.
2015-11-05 15:32:25 -05:00
2399ecc455
Merge branch 'master' of https://github.com/tgstation/-tg-station into ChemistryManual
...
Conflicts:
icons/obj/library.dmi
2015-11-05 17:03:24 +01:00
037b646f89
Merge pull request #12811 from Cuboos/A_Whole_new_bang
...
New Flash bang sounds (OW FUCK MY EARS edition)
2015-11-05 05:01:26 +03:00
fb3bbbee9c
Merge pull request #12825 from xxalpha/resist
...
Fixed cyborgs not being able to unbuckle with alarm button
2015-11-03 23:05:59 -06:00
555c37625b
Adds force and armour_penetriation to the supermatter sword
2015-11-03 02:47:26 -05:00
cd1454a71c
Merge pull request #12794 from kingofkosmos/altclickcheckfix
...
Alt+click checks fix
2015-11-03 04:19:38 +03:00
c313bd2c46
Fixed buckled, handcuffed and legcuffed alert buttons not calling resist.
2015-11-02 18:57:52 +00:00
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
f136955d80
Created a new flashbang sound and a ringing effect for when you go deaf, very realistic, it's almost like your ears are actually bleeding (NOTE: that is a joke, this isn't actually a painful sound, i checked)
2015-11-01 18:51:00 -08:00
47d1d57a69
Removes spam
2015-11-01 17:04:49 -06:00
3cd68567ab
Merge pull request #12754 from KorPhaeron/headsets
...
Adds normal captains headset to captains locker
2015-11-02 01:35:25 +03:00
046948f314
Merge pull request #12630 from KorPhaeron/Reflector
...
Laser Reflector Structure
2015-11-01 21:46:29 +00:00
99cc8aca9a
Proper istype
2015-11-01 15:36:28 -06:00
9f4db8078b
Made it possible to paint windows to make them opaque.
...
Not tinted windows
Changed how painting and opacity work.
Clean timer
2015-11-01 16:26:54 +00:00
f618a4690b
Merge pull request #12752 from KorPhaeron/xenobiology2
...
Xenobiology Control Console
2015-11-01 18:30:34 +03:00
f58dcd9e5d
3 types
2015-11-01 09:08:15 -06:00
8b22368202
Merge pull request #12678 from MMMiracles/asmartidea
...
Esword Embedding
2015-11-01 16:17:01 +03:00
8fc114e837
Merge pull request #12645 from Incoming5643/supermatter_sword
...
SUPERMATTER SWORD!
2015-11-01 15:43:06 +03:00
e75d24a6c9
Changes checks in altclicks from canusetopic to incapacitated.
2015-11-01 11:24:17 +02:00
f45b34e73b
Cleaner code
2015-11-01 01:39:33 -06:00
3e3aa2ee9f
Merge pull request #12748 from MrStonedOne/sweetsweetdimlight
...
[Pretty Pictures!] [map] Makes starlight have far spreading low levels of light rather than near spreading high levels of light.
2015-10-31 22:22:39 -05:00
5a781f93df
Merge remote-tracking branch 'refs/remotes/tgstation/master' into xenobiology2
2015-10-31 21:47:10 -05:00
phil235
duncathan salt
CosmicScientist
Firecage
Cheridan
Torger597
KorPhaeron
Aranclanos
NikNakFlak
Tkdrg
KorPhaeron
TechnoAlchemist
Xhuis
Razharas
Nerd Lord
YotaXP
Incoming5643
xxalpha
Cuboos
Remie Richards
kingofkosmos