Commit Graph

2954 Commits

Author SHA1 Message Date
Razharas 3992858ed1 Revert "Merge pull request #12067 from AnturK/resequencing"
This reverts commit d5fd4440ea, reversing
changes made to 605710d0ec.

Reverting this bullshit
2015-11-12 21:11:50 +03:00
duncathan salt d5fd4440ea Merge pull request #12067 from AnturK/resequencing
Changes to DNA Injectors
2015-11-11 10:50:30 -06:00
duncathan salt 0769ba5c00 Merge pull request #12945 from torger597/master
Adds a Syringe to the Uplink Poison/Chemical kit
2015-11-11 10:47:40 -06:00
duncathan salt 8bb0043ec7 Merge pull request #12939 from KorPhaeron/really_bad_ideas
Adds a series of ridiculous weapons to the wizard spellbook
2015-11-11 10:47:04 -06:00
duncathan salt 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
AnturK 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
phil235 79d25ef2d9 Fixes remotely detonating planted c4 with signaler.
Move CanUseTopic() procs to the correct files.
2015-11-11 15:57:05 +01:00
Torger597 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
KorPhaeron 780dfe8db1 Ridiculous weapons 2015-11-09 07:17:10 -06:00
Tkdrg 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
Tkdrg 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
Razharas 58cecbfb3a Merge pull request #12561 from phil235/ChemistryManual
Adds a chemistry manual.
2015-11-07 06:12:58 +03:00
Razharas db672c359e Merge pull request #12834 from Incoming5643/supermatter_sword
Supermatter sword fixes
2015-11-07 06:09:26 +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
phil235 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
Incoming5643 555c37625b Adds force and armour_penetriation to the supermatter sword 2015-11-03 02:47:26 -05: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
xxalpha 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
Razharas 8b22368202 Merge pull request #12678 from MMMiracles/asmartidea
Esword Embedding
2015-11-01 16:17:01 +03: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
Razharas 590644c06e Merge pull request #12686 from Firecage/jetpackobjective
Changes jetpack objective
2015-10-31 21:42:07 +03: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
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
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
Firecage d040083bf5 Adds the captains jetpack, both as an item and the new objective. 2015-10-27 17:34:27 +02: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 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
Cheridan 6bfa738a24 Merge pull request #12567 from phil235/EffectSystemTweak
Makes effect system code more OOP.
2015-10-22 21:00:10 -05:00
Cheridan 1d2b60b227 Typo fix 2015-10-22 11:20:48 -05:00
Cheridan b246835ed0 I like this path name better 2015-10-22 11:19:44 -05:00
Cheridan 5527b20a11 Upgrades SS13 to Fifth Edition 2015-10-22 11:15:46 -05:00
phil235 3c25077527 Merge branch 'master' of https://github.com/tgstation/-tg-station into ChemistryManual
Conflicts:
	icons/obj/library.dmi
2015-10-22 18:10:16 +02:00
Razharas e1bad58c4a Merge pull request #12503 from Robustin/master
Pneumatic Nerf
2015-10-22 09:33:02 +03:00
Tkdrg 0458f939b4 Adds Chainsaws
Happy Halloween!

Sprites by WalterJe.

These are force 21 two-handed weapons. They are sharp and can be
tablecrafted by spending one circular saw, one plasteel sheet, and one cable
coil, plus a welding tool for crafting. The sound used is from the
freesounds.org and was released into the public domain. It is available
at https://www.freesound.org/people/esperri/sounds/118972/.

This is a rehash of PR #6320 if you're feeling dejavu.
2015-10-21 20:11:29 -03:00