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
74f00a016d
Merge branch 'master' of https://github.com/tgstation/-tg-station into supermatter_sword
...
Conflicts:
icons/mob/inhands/items_lefthand.dmi
icons/mob/inhands/items_righthand.dmi
icons/obj/weapons.dmi
2015-10-31 19:56:13 -04:00
a9138e84c1
*Adds supermatter sword sprites
...
*Makes bullets that hit the supermatter sword get eaten
*Fixes some edge cases where a sword could eat itself
*Improves atmos handling
2015-10-31 19:48:24 -04:00
9ee8d1c256
Merge pull request #12589 from Cheridan/5e
...
Upgrades Paladin to Fifth Edition
2015-11-01 02:09:01 +03:00
6d437a4d52
Merge pull request #12728 from GunHog/Hardsuits-are-cool
...
RAD/EMP/Bomb Hardsuit messages
2015-10-31 17:27:31 -05:00
590644c06e
Merge pull request #12686 from Firecage/jetpackobjective
...
Changes jetpack objective
2015-10-31 21:42:07 +03:00
aa3198afd1
Merge pull request #12749 from GunHog/This-is-why-you-remember-to-SYNC!
...
Missing Diagnostic HUDs commit
2015-10-31 21:37:29 +03:00
615275f71f
Merge pull request #12496 from kingofkosmos/interactivescreenalerts
...
More interactive screen alerts and workarounds for the resist-button
2015-10-31 15:13:15 +03:00
8c755da84f
Adds a way to make certain area/space areas not force 100% brightness
2015-10-31 02:30:49 -07:00
354a03ea37
Headset
2015-10-30 05:30:42 -05:00
d87803fdb4
Slime blueprints
2015-10-30 04:42:20 -05:00
336b57bd5a
Missing Diagnostic HUDs commit
...
For some reason, the final commit for DiagHUDs was lost. This adds
Diagnostic HUDs to roboticist lockers, the protolathe properly, fixes
the night HUD's onmob sprite and adds a quick changelog.
2015-10-30 00:45:31 -05:00
a09d69e985
Merge pull request #12330 from feemjmeem/tanksuicide-refactor
...
re-enable tank suicide, but retain body and all objects
2015-10-29 14:27:37 +11:00
62527884ed
Merge pull request #12702 from optimumtact/pkpenguin
...
Adds a surgery to attach a chainsaw to your hand
2015-10-28 18:08:36 -05:00
f00b6101e7
Merge pull request #12698 from Firecage/youcandoitlilmonkey
...
Allows monkeys to use ointments and brute packs.
2015-10-28 17:51:56 -05:00
89f8b0eea5
Merge pull request #12697 from KorPhaeron/biobag
...
Moves biobags under biosuits
2015-10-28 16:37:19 -05:00
2c0f178e31
Embedded object -alert can be clicked to remove the object.
...
When handcuffed, a handcuffed-alert appears and clicking it is the same as clicking on resist. Same with legcuffing.
Moving in a Suit Storage Unit or welded/locked locker or morgue tray is now the equivalent of pressing resist.
2015-10-28 21:10:50 +02:00
a59d4c47f0
Merge pull request #12234 from Incoming5643/flapping_intensifies
...
Modifies plastic flaps to defeat the secret box technique.
2015-10-28 19:39:45 +03:00
NikNakFlak
Tkdrg
KorPhaeron
TechnoAlchemist
Xhuis
Razharas
Nerd Lord
YotaXP
phil235
Cheridan
Incoming5643
xxalpha
Cuboos
KorPhaeron
Remie Richards
kingofkosmos
Incoming
MrStonedOne
GunHog
Jordie