Commit Graph

6438 Commits

Author SHA1 Message Date
phil235 a8cbab01c8 Fixing the megacarp sprite by adding a pixel_x offset like the alien empress. Also giving it a mob_size of 2 (doesn't fit in regular closets). 2014-11-24 17:49:45 +01:00
phil235 86405fa8c0 Standardizes attack messages to always show the attacker first (when there is an attacker).
Replacing some fo mob in viewers() show_message() with visible message().
Simplifying some message code in a couple places, fixing typos and span classes.
2014-11-24 01:49:34 +01:00
tkdrg 35cbf8918e Adds new undershirts, jeans and pants by WalterJe
Adds the undershirts by JStheguy

Ports some pants by JStheguy from NTstation

Ports the clothes vending machine from NTstation

Adds the clothesmate restock icon by WJohnston
2014-11-23 13:58:32 -03:00
Razharas 3511e0dada Merge branch 'master' of https://github.com/tgstation/-tg-station into Cfour
Conflicts:
	code/game/turfs/simulated/walls.dm

Ye somth liek dat
2014-11-23 17:46:14 +03:00
phil235 76fa089789 Fixes blind mob not getting the cuff resist messages. 2014-11-23 15:00:40 +01:00
phil235 88b6884cd5 Fix the facehugger leap messages being bold red for third parties. 2014-11-23 13:40:57 +01:00
xxalpha 24fdc08a5b Fixes stepping when lying down.
Fixes step_action being called when lying down.
2014-11-23 00:16:21 +00:00
Cheridan 448d0fab7f Merge pull request #5913 from tkdrg/yearslater
Makes cyborg modules NODROP
2014-11-21 10:17:53 -06:00
Hornygranny 678a13c451 moves emag effects from attackby() into atom proc emag_act() 2014-11-20 17:49:06 -08:00
tkdrg 3bb478f12f Includes antag HUDs in the datum hud overhaul
Makes hud_list associative, and introduces the /atom list hud_possible,
which lists all the possible hud images a certain atom can provide.

Replaces all the awful procs in the gamemodes with their new
/datum/atom_hud versions, which are much shorter, simpler and faster.
2014-11-20 15:43:51 -03:00
Cheridan 0da09e3f6b Merge pull request #5557 from Incoming5643/magicmania1.76
Magic Mania 1.76: Lets outrun the feature freeze
2014-11-20 09:07:41 -06:00
Remie Richards ec66af5195 Cleans up italics logic 2014-11-19 20:25:54 +00:00
Razharas afac70c4f7 Merge branch 'master' of https://github.com/tgstation/-tg-station into Cfour 2014-11-19 21:37:06 +03:00
Razharas ff456ebaf4 Unwinded most of shit
Meh
2014-11-19 21:36:45 +03:00
Remie Richards 308526d35d Removes unnecessary check 2014-11-19 17:27:08 +00:00
Remie Richards 99fe1c9d04 Sounds in space/places with low pressure are quieter. You cannot hear people in low pressure environments unless you are next to them (or are them) 2014-11-19 17:03:12 +00:00
Cheridan 1208c48af3 Merge pull request #5652 from Menshin/atmos_z_level_fix
Atmos z level fix + radio controller code sanitization
2014-11-18 17:05:14 -06:00
Cheridan c98448b5c2 Merge pull request #5650 from phil235/MechAtkFix1
All mechs get a melee attack
2014-11-18 12:53:52 -06:00
JJRcop 140d368918 Fixes unreported issue with get_ghost
Get_ghost was not returning the ghost if players were disconnected from the server while ghosted
2014-11-18 12:31:19 -05:00
Razharas b7d08c591e Merge branch 'master' of https://github.com/tgstation/-tg-station into Cfour 2014-11-18 16:23:04 +03:00
Razharas b071a0167e Made explosions work in a slightly different way
Yep
2014-11-18 16:22:41 +03:00
tkdrg fae2ffc3ee Datum-based huds! Lays down the framework not only for data huds but also for antag huds. 2014-11-17 19:38:29 -03:00
tkdrg e9ec8645bb Hud rewrite rewrite. Now datum-based and somewhat generic. 2014-11-17 01:28:45 -03:00
tkdrg 0f28c013ff Makes cyborg modules NODROP 2014-11-16 15:59:57 -03:00
tkdrg 10aaf42b5b Data hud revamp improvements and bugsquashing
Adds a changelog for the HUD change.
2014-11-16 15:53:37 -03:00
Remie Richards 8f2205eeb7 Add's banned_reagents list to reagent_containers,
Fixes chemsprayer afterattack() copypaste
Acid reagents do half as much damage as before to humans
Acid reagents do more damage to /living mobs that are not humans (old numbers were pathetic)
/Spray containers fire 2x slower than other ranged weapons
2014-11-16 10:28:43 +00:00
tkdrg e05dbe3b27 Fixes facehuger bugs 2014-11-16 03:26:27 -03:00
tkdrg 705a264dcf Makes data huds passive. 2014-11-16 01:52:06 -03:00
hornygranny 509c07650f Merge pull request #5802 from paprka/EATITFATTY
Clothing sprite/file path changes
2014-11-15 20:28:43 -08:00
hornygranny ac6d5b9558 Merge pull request #5861 from tkdrg/moarfloors
Floor refactor MkII
2014-11-15 20:13:50 -08:00
Incoming fbbc77f905 Merge branch 'master' of https://github.com/tgstation/-tg-station into magicmania1.76
Conflicts:
	code/modules/projectiles/projectile/magic.dm
2014-11-15 14:44:51 -05:00
Razharas 2ec1658be0 Merge pull request #5735 from phil235/StingMiddleClickRuntimeFIx
Moving carbon/middleclickon() form carbon.dm to click.dm
2014-11-15 02:51:24 +03:00
Remie Richards 2f57a8980a Merge pull request #5804 from TZK13/Preferences-Setup-Fixes-2
Fixes the previews in the character setup screen again
2014-11-14 18:29:17 +00:00
tkdrg 77a6df36f7 Merge remote-tracking branch 'upstream/master' into moarfloors
Conflicts:
	_maps/map_files/MetaStation.v39K.dmm
	_maps/map_files/MiniStation/MiniStation.dmm
	_maps/map_files/tgstation.2.1.3.dmm
	code/game/machinery/bots/floorbot.dm
2014-11-14 15:23:35 -03:00
Remie Richards 17607d0aa2 Merge pull request #5776 from MrPerson/throwing_changes
Throwing bugfixes
2014-11-14 18:04:00 +00:00
Menshin ec944abfc6 * limit atmos/fire alerts to the current z_level
* atmos/fire alerts are now linked to an object and not its area, as intended
* simplified and full pathed the radio frequency datum
* made radio objects properly clean on del/qdel, instead of letting the radio controller remove nulls at each post_signal()
2014-11-14 10:10:45 +01:00
paprka ec6b2424d2 purge the unused 2014-11-13 21:10:53 -08:00
Cheridan 864692abad Merge pull request #5813 from paprka/suicideviaborg
Gives borgs appropriate module-based flashlights
2014-11-13 19:56:15 -06:00
Cheridan 37081d444e Merge pull request #5744 from tkdrg/ihatelife
Cleans up Life() a little bit
2014-11-13 17:48:18 -06:00
Cheridan 38eeca2ebd Merge pull request #5644 from Jordie0608/beekeepermodewhen
Adds bee swarms and butterflies and diseases to create them
2014-11-13 17:04:29 -06:00
phil235 fce8781994 Merge branch 'master' of https://github.com/tgstation/-tg-station into StingMiddleClickRuntimeFIx
Conflicts:
	code/modules/mob/living/carbon/carbon.dm
2014-11-13 17:44:09 +01:00
phil235 a005055cf3 Merge branch 'master' of https://github.com/tgstation/-tg-station into MechAtkFix1
Conflicts:
	code/modules/mob/living/carbon/human/human_defense.dm
	code/modules/mob/living/living_defense.dm
2014-11-13 17:17:23 +01:00
tkdrg ed4c03b099 Floor cleanup: Repaths /turf/simulated/floor to /turf/simulated/floor/plasteel
Repaths carpet and grass to /turf/simulated/floor/fancy/carpet and /turf/simulated/floor/fancy/grass
Cleans up a few floor procs
2014-11-12 22:50:32 -03:00
hornygranny ace3848ed8 Merge pull request #5801 from tkdrg/spessspeed
Speeds up space movement a little bit
2014-11-10 20:19:54 -08:00
paprka 057482c64b gives borgs appropriate module-based flashlights 2014-11-10 10:54:35 -08:00
Swag McYolosteinen 7ce90ff54a Merge pull request #5654 from GunHog/Potato_AI_Wants_To_Hear_You_Scream_Too
Gives Traitor AIs the Syndicate Channel!
2014-11-10 17:18:04 +01:00
hornygranny 1cbfe107b5 Merge pull request #5751 from Miauw62/blugh
Fixes border window phasing.
2014-11-10 08:15:46 -08:00
Swag McYolosteinen 9893fbc86f Merge pull request #5645 from Ergovisavi/firefighting
Firefighting changes
2014-11-10 16:55:38 +01:00
Cheridan 5514f6f644 Merge pull request #5765 from tkdrg/reactconstruct
Adds check_shields() to attack_animal and friends
2014-11-09 21:19:21 -06:00
TZK13 109076dc63 Updates labcoats in the preferences setup screen to appear closed and changes the lawyer's shoes to be lace ups instead of brown. 2014-11-09 19:30:33 -06:00