Commit Graph

6228 Commits

Author SHA1 Message Date
Razharas f618a4690b Merge pull request #12752 from KorPhaeron/xenobiology2
Xenobiology Control Console
2015-11-01 18:30:34 +03: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
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 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
KiwiFarms 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
Razharas ba1b70106d Merge pull request #12497 from bgobandit/ayyyfixes
Even more xenobiology fixes and tweaks
2015-10-27 18:28:48 +03:00
Tkdrg 2b1a1f42fd Fixes chainsaws losing force when dropped
Fixes #12683
2015-10-27 11:36:55 -03:00
MMMiracles 37ea3902e1 Allows eswords to embed if thrown. If you're crazy enough to throw your death stick at the guy you're trying to kill you should be rewarded for actually hitting. 2015-10-26 23:56:16 -04:00
francinum 86f5a28e73 Update twohanded.dm 2015-10-26 13:27:24 -04:00
francinum faeabc713f Makes Twohand Required pickup use wield()
Fucking Ergo.
2015-10-26 13:18:11 -04:00
francinum 659823392f You drop The Murderfucker.
the to \the
2015-10-26 12:51:28 -04:00
francinum 571627b501 Goddamnit. 2015-10-25 22:41:11 -04:00
francinum 0f3a6d11c3 You drop the chainsaw. 2015-10-25 22:40:02 -04:00
Incoming 5a4d72f5a4 *Supermatter sword will now passively eat through anything you put it in, and burn through the floor it's resting on!
*Supermatter sword now laughs at explosions and acid!
2015-10-25 22:08:22 -04:00
francinum 44f3e23bf0 chainsaw is too cumbersome to carry in one hand! 2015-10-25 22:01:30 -04:00
Cheridan ed9b0c35c6 Merge pull request #12612 from phil235/BugFixBoogalooI
bugfixes: bloodcrawl, losebreath, wintercoat, and more
2015-10-25 14:19:11 -05:00
Cheridan a53d35e00c Merge pull request #12548 from tkdrg/ilive_again
Adds Chainsaws
2015-10-25 13:09:55 -05:00
Cheridan b10368c3e3 Merge pull request #12306 from Incoming5643/RTD
Adds d1 and d100 dice
2015-10-25 05:19:17 -05:00
Incoming ef24943bc9 SUPERMATTER SWORD!
It's a sword made of supermatter! It'll dust nearly anything! It's hilariously lethal to actually attack with without radiation shielding! It's still eventually lethal even WITH radiation shielding! Admin Only! Good Ideas!
2015-10-25 03:15:07 -04:00
Incoming5643 c4af09089c no comment 2015-10-24 23:44:22 -04:00
Incoming 5b3215a6d7 @memo incoming wow making sure you update to master sure is hard huh? 2015-10-24 23:43:26 -04:00
Incoming ddbfec6fbc Merge branch 'master' of https://github.com/tgstation/-tg-station into flapping_intensifies
Conflicts:
	code/game/machinery/computer/shuttle.dm
2015-10-24 23:32:55 -04:00
phil235 da84fcd8d2 - Fixes shadowling receiving burn messages even when dead. I've also fixed the same bug for other species and made certain spec_life() procs not run when the mob is dead. I also made slime species a subtype of jelly species since they had a lot of code in common thus reducing duplicate code.
- Fixes odd behavior with emagging airlock and windoor animation.
- Fixes being able to bloodcrawl in oil decal.
- Fixes being deaf after bloodcrawling.
- Fixes wintercoat hood appearing below the mask.
- Fixes being able to attack another mob before the game has started (and other things which used a gamestart check that no longer works).
- Ghosts can no longer become drones before the game has started.
- Removed "bhunger" and "ajourn" mob vars, they are unused.
- Fixes admin-revived morph being invisible.
- Fixes heart attack stacking losebreath very high. Also now losebreath is reset to 0 when the mob dies.
- All mobs no longer have a default strip menu showing two hands.
2015-10-23 20:00:52 +02:00