43583d37b8
Merge pull request #12912 from Niknakflak/FigureToys
...
Ports action figures
2015-11-09 13:11:16 -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
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
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
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
555c37625b
Adds force and armour_penetriation to the supermatter sword
2015-11-03 02:47:26 -05: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
046948f314
Merge pull request #12630 from KorPhaeron/Reflector
...
Laser Reflector Structure
2015-11-01 21:46:29 +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
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
590644c06e
Merge pull request #12686 from Firecage/jetpackobjective
...
Changes jetpack objective
2015-10-31 21:42:07 +03:00
d87803fdb4
Slime blueprints
2015-10-30 04:42:20 -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
6d89f6cd69
Merge pull request #12687 from tkdrg/uncreative_branch_name
...
Fixes chainsaws losing force when dropped
2015-10-28 19:30:22 +03:00
9357602233
Merge pull request #12665 from tkdrg/ghost_medsechuds
...
[READY] Adds a ghost on-screen HUD
2015-10-28 05:19:19 +03:00
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
69ed8e756d
Allows monkeys to use ointments and brute packs.
2015-10-28 00:10:11 +02:00
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
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
d040083bf5
Adds the captains jetpack, both as an item and the new objective.
2015-10-27 17:34:27 +02:00
ba1b70106d
Merge pull request #12497 from bgobandit/ayyyfixes
...
Even more xenobiology fixes and tweaks
2015-10-27 18:28:48 +03:00
2b1a1f42fd
Fixes chainsaws losing force when dropped
...
Fixes #12683
2015-10-27 11:36:55 -03:00
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
86f5a28e73
Update twohanded.dm
2015-10-26 13:27:24 -04:00
faeabc713f
Makes Twohand Required pickup use wield()
...
Fucking Ergo.
2015-10-26 13:18:11 -04:00
659823392f
You drop The Murderfucker.
...
the to \the
2015-10-26 12:51:28 -04:00
571627b501
Goddamnit.
2015-10-25 22:41:11 -04:00
0f3a6d11c3
You drop the chainsaw.
2015-10-25 22:40:02 -04:00
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
44f3e23bf0
chainsaw is too cumbersome to carry in one hand!
2015-10-25 22:01:30 -04:00
a53d35e00c
Merge pull request #12548 from tkdrg/ilive_again
...
Adds Chainsaws
2015-10-25 13:09:55 -05:00
Cheridan
Aranclanos
NikNakFlak
Tkdrg
Xhuis
Razharas
Nerd Lord
YotaXP
phil235
Incoming5643
Cuboos
Remie Richards
KorPhaeron
Incoming
Jordie
KiwiFarms
Firecage
MMMiracles
francinum