Commit Graph

6248 Commits

Author SHA1 Message Date
Razharas
db672c359e Merge pull request #12834 from Incoming5643/supermatter_sword
Supermatter sword fixes
2015-11-07 06:09:26 +03:00
Razharas
5e736281a7 Merge pull request #12871 from YotaXP/origin_tech_fix
Fixed bad `origin_tech` values.
2015-11-07 06:06:48 +03:00
Nerd Lord
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
YotaXP
2ffc5f055c Fixed bad origin_tech values. 2015-11-05 15:32:25 -05:00
Razharas
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
Cheridan
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
Incoming5643
555c37625b Adds force and armour_penetriation to the supermatter sword 2015-11-03 02:47:26 -05:00
Razharas
cd1454a71c Merge pull request #12794 from kingofkosmos/altclickcheckfix
Alt+click checks fix
2015-11-03 04:19:38 +03:00
xxalpha
c313bd2c46 Fixed buckled, handcuffed and legcuffed alert buttons not calling resist. 2015-11-02 18:57:52 +00:00
Cuboos
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
KorPhaeron
47d1d57a69 Removes spam 2015-11-01 17:04:49 -06:00
Razharas
3cd68567ab Merge pull request #12754 from KorPhaeron/headsets
Adds normal captains headset to captains locker
2015-11-02 01:35:25 +03:00
Remie Richards
046948f314 Merge pull request #12630 from KorPhaeron/Reflector
Laser Reflector Structure
2015-11-01 21:46:29 +00:00
KorPhaeron
99cc8aca9a Proper istype 2015-11-01 15:36:28 -06:00
Razharas
f618a4690b Merge pull request #12752 from KorPhaeron/xenobiology2
Xenobiology Control Console
2015-11-01 18:30:34 +03:00
KorPhaeron
f58dcd9e5d 3 types 2015-11-01 09:08:15 -06:00
Razharas
8b22368202 Merge pull request #12678 from MMMiracles/asmartidea
Esword Embedding
2015-11-01 16:17:01 +03:00
Razharas
8fc114e837 Merge pull request #12645 from Incoming5643/supermatter_sword
SUPERMATTER SWORD!
2015-11-01 15:43:06 +03:00
kingofkosmos
e75d24a6c9 Changes checks in altclicks from canusetopic to incapacitated. 2015-11-01 11:24:17 +02:00
KorPhaeron
f45b34e73b Cleaner code 2015-11-01 01:39:33 -06:00
Cheridan
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
KorPhaeron
5a781f93df Merge remote-tracking branch 'refs/remotes/tgstation/master' into xenobiology2 2015-10-31 21:47:10 -05:00
Incoming
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
Incoming
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
Razharas
9ee8d1c256 Merge pull request #12589 from Cheridan/5e
Upgrades Paladin to Fifth Edition
2015-11-01 02:09:01 +03:00
Cheridan
6d437a4d52 Merge pull request #12728 from GunHog/Hardsuits-are-cool
RAD/EMP/Bomb Hardsuit messages
2015-10-31 17:27:31 -05:00
Razharas
590644c06e Merge pull request #12686 from Firecage/jetpackobjective
Changes jetpack objective
2015-10-31 21:42:07 +03:00
Razharas
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
Razharas
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
MrStonedOne
8c755da84f Adds a way to make certain area/space areas not force 100% brightness 2015-10-31 02:30:49 -07:00
KorPhaeron
354a03ea37 Headset 2015-10-30 05:30:42 -05:00
KorPhaeron
d87803fdb4 Slime blueprints 2015-10-30 04:42:20 -05:00
GunHog
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
Jordie
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
Cheridan
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
Cheridan
f00b6101e7 Merge pull request #12698 from Firecage/youcandoitlilmonkey
Allows monkeys to use ointments and brute packs.
2015-10-28 17:51:56 -05:00
Cheridan
89f8b0eea5 Merge pull request #12697 from KorPhaeron/biobag
Moves biobags under biosuits
2015-10-28 16:37:19 -05:00
kingofkosmos
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
Razharas
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
Razharas
980b3ec4a3 Merge pull request #12071 from KorPhaeron/captainqol
Small tweaks to captains starting equipment
2015-10-28 19:36:09 +03:00
GunHog
20120417d3 Hardsuit upgrades!
- Hardsuits now respond to EMP and Radiation, warning the user.
- The Prototype Hardsuit now has a bomb detector.
2015-10-28 11:33:47 -05:00
Razharas
6d89f6cd69 Merge pull request #12687 from tkdrg/uncreative_branch_name
Fixes chainsaws losing force when dropped
2015-10-28 19:30:22 +03:00
Razharas
9357602233 Merge pull request #12665 from tkdrg/ghost_medsechuds
[READY] Adds a ghost on-screen HUD
2015-10-28 05:19:19 +03:00
Tkdrg
dd20530f0e Adds ghost alerts.
Adds ghost alerts for revival (cloning, MMIs, nar-sie, drones, etc).
2015-10-27 23:07:41 -03:00
PKPenguin321
fe8d0e58cd Adds a surgery to attach a chainsaw to your hand
Once added you cannot remove the chainsaw and the hand will be forever
used
2015-10-28 12:16:58 +13:00
Firecage
69ed8e756d Allows monkeys to use ointments and brute packs. 2015-10-28 00:10:11 +02:00
KorPhaeron
fe6adf6cc1 Biobag 2015-10-27 16:13:43 -05:00
MMMiracles
2bcc3aeb9e Embed chance of 75% because having less than 1/2 of a chance of your magic death stick being tossed into your enemy's hand could only go right.
Also changelog.
2015-10-27 16:06:02 -04:00
Cheridan
fe41766141 Merge pull request #12658 from francinum/patch-7
chainsaw is too cumbersome to carry in one hand!
2015-10-27 11:12:08 -05:00
Firecage
d040083bf5 Adds the captains jetpack, both as an item and the new objective. 2015-10-27 17:34:27 +02:00