Razharas
b3ed636d3c
Merge pull request #13034 from kingofkosmos/shardspacenoslip
...
Stops glass shards from hurting you in space
2015-11-17 05:33:15 +03:00
Razharas
e9dae3be88
Merge pull request #13015 from SuperSayu/Holodecker
...
Holodeck Upgrades [MAP]
2015-11-16 04:51:49 +03:00
Vincent
faf5ddaceb
Holodeck refactor and Enchancements
...
Moves holodeck code to modules/holodeck. Repaths holodeck structures a little. Cleans holodeck code and prepares for additional features (multiple holodecks, etc). Should fix #4828 .
Necessary map bugfixen for Asteroid, Disc, Dream, Meta, and TG.
Adds Lounge, Emergency Medical, pet center, and holdout room to the rec holodeck.
All items spawned by the holodeck will do only stamina damage, except when emagged. This allows emergency medical to be staffed with scalpels and bonesaws and such. Emergency medical has some functioning equipment but the only drugs available are in the sleeper.
2015-11-15 20:23:23 -05:00
kingofkosmos
156d9b558c
Crossing a glass shard in space without shoes won't hurt and stun the user anymore.
2015-11-15 17:19:07 +02:00
duncathan salt
31e30ab768
Merge pull request #12955 from CosmicScientist/FixingThePast
...
Makes the dehydrated carp less ambiguous and decreases its TC cost
2015-11-14 23:42:58 -06:00
Cheridan
9a68f6b69b
Merge pull request #13003 from Incoming5643/stop_being_broken_at_being_broken
...
The further trials and tribulations of the supermatter sword bugfix
2015-11-14 11:49:55 -06:00
Incoming
bf34b97b1e
Gives supermatter swords a better check for adjacency, and moves the parent code below the dust code to be extra sure <b>nothing escapes</b>.
...
I started up a test server and was smacking people to dust like a pro, armor or not.
2015-11-13 01:13:05 -05:00
duncathan salt
df6ac90baa
Revert "Revert "Merge pull request #12067 from AnturK/resequencing""
2015-11-12 15:25:31 -06:00
Razharas
3992858ed1
Revert "Merge pull request #12067 from AnturK/resequencing"
...
This reverts commit d5fd4440ea605710d0ec
2015-11-12 21:11:50 +03:00
duncathan salt
4fcdc7d748
Merge pull request #12950 from phil235/AIMechStunFix
...
Fixes flashbanged mmis in mechs losing access to most mech functions
2015-11-11 16:34:24 -06:00
duncathan salt
b1d1ecb81f
Merge pull request #12904 from Incoming5643/action_action_action_action_action
...
Adds action buttons for slimes
2015-11-11 15:21:05 -06:00
Incoming
d8a0dc6b54
jumps through hoops to save two lines
...
adds slime growth as a define
2015-11-11 16:00:38 -05: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
CosmicScientist
c8391680a6
So I must bury it.
2015-11-10 23:46:17 +00:00
CosmicScientist
af74475cad
Because I cannot bear it.
2015-11-10 23:41:59 +00:00
phil235
102ee66c69
Updating one comment
2015-11-10 22:42:17 +01:00
phil235
db67825974
Fixes being able to stun AI and MMI forever with flashbang, preventing them from using their mech. Brain mobs can no longer get flashed or flashbanged. Silicons are no longer affected by the sound bang of the flashbang (since they have no ears).
...
Fixes a runtime with two blob reagents.
Fixes a reference not being removed when hydro tray is destroyed.
Laser pointer can no longer weaken AIs (no eyes).
2015-11-10 22:06:54 +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
Cheridan
43583d37b8
Merge pull request #12912 from Niknakflak/FigureToys
...
Ports action figures
2015-11-09 13:11:16 -06:00
KorPhaeron
780dfe8db1
Ridiculous weapons
2015-11-09 07:17:10 -06:00
Aranclanos
424d33b365
Merge pull request #12890 from Xhuis/balance_patch
...
Miscellaneous balance changes
2015-11-09 03:16:38 -03:00
NikNakFlak
998bcb3aed
Makes fixes Jordie totally didn't do himself
2015-11-08 23:15:38 -07:00
Aranclanos
d454eae1b1
Merge pull request #12916 from tkdrg/ripinpiss
...
Removes PDA chatrooms
2015-11-09 02:56:41 -03:00
Tkdrg
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
NikNakFlak
e624574c65
Ports action figures pew pew pew
2015-11-07 18:40:45 -07: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
Xhuis
1c0b434997
Balance changes
2015-11-06 22:16:04 -05: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
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
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
Tkdrg
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
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
Remie Richards
046948f314
Merge pull request #12630 from KorPhaeron/Reflector
...
Laser Reflector Structure
2015-11-01 21:46:29 +00: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
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
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
