Commit Graph

12673 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
Cheridan
e52db34ce3 Merge pull request #6132 from phil235/VirusFix2
Fixes some incurable diseases
2014-12-02 08:18:04 -06:00
Razharas
0b5ae9899e Merge pull request #6125 from MrPerson/span_classes_never_heard_of_them
Removes a stray /red in robot_upgrades.dm
2014-12-02 15:54:17 +03:00
Razharas
b9b73531a6 Merge pull request #6104 from tkdrg/bouncy
Stops the field from bouncing the sing around
2014-12-01 18:14:12 +03:00
Razharas
a08c7a0856 Merge pull request #6117 from Intigracy/you'renotverybright
Sanitizes OOC color editing
2014-12-01 17:51:31 +03:00
Razharas
c8817469fc Merge pull request #6124 from MrPerson/eye_lmao
Redo cyborg icon updating
2014-11-30 22:46:37 +03:00
hornygranny
33e07e2291 Merge pull request #6113 from tkdrg/ass
Fixes assistant jobban bug
2014-11-28 16:35:12 -08:00
hornygranny
9ea01e3e44 Merge pull request #6107 from tkdrg/runtimesfuntimes
Fixes pacid chem grenade runtime
2014-11-28 16:35:01 -08:00
hornygranny
e7d862b248 Merge pull request #6119 from Intigracy/recursivebyebye
Removes recursive explosions
2014-11-28 16:33:30 -08:00
phil235
7d9c9bd5fc Fixing fake_gbs, gbs, magnitis and maybe other diseases not being curable. 2014-11-28 22:31:04 +01:00
Razharas
da35b4dadc Merge pull request #6115 from CorruptComputer/pdashitstorm
Added a cancel button to the PDA
2014-11-28 20:52:38 +03:00
Razharas
b3f79777c9 Merge pull request #6092 from optimumtact/patch-1
Stop items having a negative throw force against grilles
2014-11-28 15:16:59 +03:00
Razharas
9e0d8c6ef6 Merge pull request #6094 from tkdrg/cuffmsg
Adds some feedback messages for handcuffing
2014-11-28 15:13:36 +03:00
MrPerson
62e9f21382 Removes a stray \red in robot_upgrades.dm 2014-11-27 23:21:35 -08: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
Intigracy
8a1baad03b forgot the var / proc 2014-11-27 14:50:21 -08:00
Intigracy
31835f1987 Removes the unused explosion_recursive.dm and everything related to it, including the configuration option. 2014-11-27 14:28:20 -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
67c7dae5fd Merge pull request #6089 from GunHog/TG_Dreamworks_How_To_Train_Your_Bot
Bot movement fixes
2014-11-27 13:53:23 -08:00
hornygranny
b42105770b Merge pull request #6081 from Razharas/CompFix
Fix of comms console cooldown and computer rework
2014-11-27 13:52:17 -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
Razharas
d2848e5f95 Merge branch 'master' of https://github.com/tgstation/-tg-station into Cfour 2014-11-28 00:32:30 +03:00
Razharas
2971c2cf40 Makes walls not break shit under them
SEE HOW EASY IT IS WITH THE NEW EXPLOSIONS?
YEAH THATS RIGHT NIGA THATS HOW WE DO IT IN THE PROPER CODING TOWN
BIATCH
2014-11-28 00:32:08 +03:00
Intigracy
e9b5f83de2 Update ooc.dm
shhhh
2014-11-27 13:25:16 -08:00
Intigracy
aeb96a5f0f sanitizes OOC color editing
consistency in colour vs color
2014-11-27 13:09:09 -08:00
CorruptComputer
058e342e95 Added a cancel button to the PDA 2014-11-27 14:27:00 -06:00
tkdrg
4da919ce75 Fixes assistant jobban bug
Assistant-banned people who had assistant set to 'Yes' were unable to
pick their job preferences.
2014-11-27 16:51:15 -03:00
tkdrg
30477f00c4 Fixes pacid chem grenade runtime 2014-11-27 13:51:45 -03: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
275d7fdd77 Merge pull request #6038 from paprka/hatfix
fixes head of security and warden hat flashbang confusion
2014-11-27 17:14:51 +03:00
tkdrg
65fb61be69 Stops the field from bouncing the sing around 2014-11-27 10:33:24 -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
41a43b0040 Quickfix 2014-11-27 15:30:24 +03:00
Razharas
4998b19ddf Merge pull request #5679 from Aranclanos/projectilesBump
Projectiles bump fix, spawn() removal
2014-11-27 03:38:05 +03:00
tkdrg
afbc910505 Adds some feedback messages for handcuffing. 2014-11-26 21:27:53 -03:00
Orange Borg
c9665d4b2f Stop items having a negative throw force against grilles
This prevents the grille from gaining health if you hit it with something less than 5 tforce
2014-11-27 12:07:55 +13:00
GunHog
0ebecee434 Bot movement fixes
fixes #6064
Used a different move proc to allow dense bots to open doors again.
- Removed duplicated Bump() code in ED-209.
- Bots will no longer try to path through bolted airlocks.
- Bots will no longer try to path through shutters thinking they can
open them.
2014-11-26 15:41:08 -06:00
hornygranny
64777be5d5 Merge pull request #6070 from Razharas/VirShit
Final fix for viruses not working
2014-11-26 13:32:29 -08: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
hornygranny
7cec307bf4 Merge pull request #5917 from RemieRichards/FixAcidBalance
Nerfs acid and cleans up /spray afterattack
2014-11-26 11:12:11 -08:00
hornygranny
7bfd789b4d Merge pull request #5959 from tkdrg/boxin
Makes storage items update properly on insertion
2014-11-26 11:05:09 -08:00
hornygranny
96835f0aa1 Merge pull request #5936 from paprka/doors
Improves airlock closing and density/crush()
2014-11-26 11:03:07 -08:00
hornygranny
88896cea50 Merge pull request #5948 from tkdrg/monkeytrouble
Makes condensed capsaicin work on monkeys
2014-11-26 11:02:30 -08: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
3ad160f98e Merge pull request #6027 from fleure/airlockfix
Fixes multiple airlocks on same tile
2014-11-26 10:57:54 -08:00
hornygranny
fb3c9d7d11 Merge pull request #6062 from TZK13/yeloww
Fixes yellow wardrobes being invisible when you closed them
2014-11-26 10:57:30 -08:00
hornygranny
d5c83e41ef Merge pull request #6066 from Menshin/You_never_wash_up_after_yourself
A little seasonal cleaning
2014-11-26 10:51:59 -08:00
hornygranny
b24c51a992 Merge pull request #6065 from Razharas/BorgChemFix
Fix for omnious reagent transfer error in #1673
2014-11-26 10:51:40 -08:00
Cheridan
096a7c3770 Merge pull request #6013 from tkdrg/dropthesoap
Fixes wizard slipping on all the area soaps
2014-11-26 11:36:31 -06:00