Commit Graph

3342 Commits

Author SHA1 Message Date
GunHog 6ac3d8f2e8 Lets AI and Borgs control auto announcements
The AI and cyborgs can now control if they speak on the radio and the
channel used when stating laws or  (AI only) announcing new player
arrivals.
2014-12-02 11:43:36 -06:00
Razharas c8817469fc Merge pull request #6124 from MrPerson/eye_lmao
Redo cyborg icon updating
2014-11-30 22:46:37 +03:00
MrPerson 89030ad3f7 Redo cyborg icon updating
Removed the stupid "updateicon()" proc and placed the behavior in update_icons() and regenerate_icons()
Removed redundant update_fire() calls
Fixes #6057 since the staff calls regenerate_icons()
2014-11-27 23:04:35 -08:00
hornygranny b573a00f5e Merge pull request #5918 from Razharas/Cfour
Who am i kidding, its explosions rework for a long time already
2014-11-27 13:58:56 -08:00
hornygranny bc7a7a7452 Merge pull request #6084 from tkdrg/hudindahood
Fixes data/antag HUD bugs
2014-11-27 13:50:34 -08:00
hornygranny dff524910a Merge pull request #6088 from RemieRichards/SomeAcidBuffs
Couple more changes to reagent sprayers.
2014-11-27 13:49:25 -08:00
tkdrg 7153becc62 Fixes implants not updating the implant secHUD
Makes med huds /carbon because of monkeys
Makes HUDs update after implant removal surgery
Fixes cloning not recovering antag huds
2014-11-27 12:56:17 -03:00
Razharas c5209f2399 Merge branch 'master' of https://github.com/tgstation/-tg-station into Cfour 2014-11-27 15:30:37 +03:00
Razharas 4998b19ddf Merge pull request #5679 from Aranclanos/projectilesBump
Projectiles bump fix, spawn() removal
2014-11-27 03:38:05 +03:00
Remie Richards e1b77438e0 Allows emagged med borg sprayer to hold acid (as it does normally, this fix just lets them refil it with more acid if they please)
Let's the Chemsprayer spray acids.
2014-11-26 21:10:19 +00:00
Remie Richards 5343f2d1fa Merge branch 'master' of https://github.com/tgstation/-tg-station into FixAcidBalance
Conflicts:
	code/modules/mob/living/living_defense.dm
2014-11-26 19:01:17 +00:00
hornygranny c79ea305a0 Merge pull request #6056 from tkdrg/paintsl
Fixes pAI NTRC
2014-11-25 17:42:29 -08:00
hornygranny 21b8df82d5 Merge pull request #5908 from tkdrg/hud
Makes data and antag huds passive and creates /datum/atom_hud
2014-11-25 12:53:03 -08:00
hornygranny 1032cca0b7 Merge pull request #6051 from phil235/BigCarpSpriteFix
Fixing the megacarp sprite
2014-11-25 12:39:54 -08:00
tkdrg 2090a93783 Fixes pAI NTSL 2014-11-24 21:31:26 -03:00
hornygranny 365ce13098 Merge pull request #6017 from xxalpha/stepfix
Fixes step_action() being called when lying down.
2014-11-24 10:35:31 -08:00
hornygranny 15a34fe3c9 Merge pull request #6022 from phil235/CuffResBlindMsgFix
Fixes blind mob not getting the cuff resist messages.
2014-11-24 10:35:09 -08:00
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
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
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
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
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
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