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
d2848e5f95
Merge branch 'master' of https://github.com/tgstation/-tg-station into Cfour
2014-11-28 00:32:30 +03:00
CorruptComputer
058e342e95
Added a cancel button to the PDA
2014-11-27 14:27:00 -06: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
Razharas
c5209f2399
Merge branch 'master' of https://github.com/tgstation/-tg-station into Cfour
2014-11-27 15:30:37 +03:00
paprka
882e868e7b
Fixed runtime and added syndie headset protection
2014-11-24 21:54:09 -08:00
hornygranny
a24eeb7f93
Merge pull request #5758 from phil235/TorchFix
...
Fixes the torch and flare icons.
2014-11-24 15:18:08 -08:00
paprka
6d86949742
removes flashbang protection from hats, gives it to bowman headsets
2014-11-24 05:55:13 -08:00
Razharas
84e69cff6b
Conflict resolve
...
Damn cables
2014-11-24 12:27:53 +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
0bc84e120e
Merge branch 'master' of https://github.com/tgstation/-tg-station into TorchFix
...
Conflicts:
icons/mob/items_lefthand.dmi
Adding PR 5829 to my PR so both can be merged now.
2014-11-22 18:56:31 +01:00
phil235
d6c2cb4df5
Fix the traitor health analyzer (radiation laser) making the attack animation and hitsound when used on target. Changing one span class and removing one text() stuff.
2014-11-22 17:36:02 +01:00
Cheridan
a9199118e5
Merge pull request #5925 from paprka/flashfix
...
Fixes flashes being useless
2014-11-21 10:14:39 -06:00
paprka
41c86dd557
fixes disarming affecting area stuns
2014-11-21 08:06:07 -08:00
Razharas
afac70c4f7
Merge branch 'master' of https://github.com/tgstation/-tg-station into Cfour
2014-11-19 21:37:06 +03:00
Razharas
b071a0167e
Made explosions work in a slightly different way
...
Yep
2014-11-18 16:22:41 +03:00
paprka
649be7cf8a
Fixes flashes being useless
2014-11-16 14:39:50 -08: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
phil235
a248a1a4db
Conflicts:
...
icons/mob/items_lefthand.dmi
icons/mob/items_righthand.dmi
2014-11-13 17:33:32 +01:00
GunHog
4bc6ded418
Merge remote-tracking branch 'remotes/upstream/master' into Potato_AI_Wants_To_Hear_You_Scream_Too
...
Conflicts:
code/modules/mob/living/silicon/ai/ai.dm
2014-11-09 12:27:48 -06:00
hornygranny
4ff8507c85
Merge pull request #5727 from phil235/RecorderFix
...
Fixes the tape recorder. (one typo)
2014-11-08 15:07:47 -08:00
phil235
8f855bf49a
Fixes the torch and flare icons, especially the "on" inhand icons.
2014-11-08 16:14:19 +01:00
Remie Richards
2054cbda08
Merge branch 'master' of https://github.com/tgstation/-tg-station into DiseaseRework
...
Conflicts:
code/modules/mob/living/carbon/carbon.dm
code/modules/mob/living/carbon/human/human_attackpaw.dm
code/modules/mob/living/carbon/monkey/monkey.dm
2014-11-08 01:07:29 +00:00
phil235
7ca1c48206
Fix the tape recorder.
2014-11-07 10:52:52 +01:00
tkdrg
a0b61707a4
NTRC (PDA chatrooms) bugfixes
...
Removed operator, revamped structure, fixed a lot of bugs
Adds myself to admins.txt
2014-11-04 22:47:48 -03:00
GunHog
3c58bf7435
Moved some things around!
...
All radios now have a keyslot var (replacing keyslot1 for headsets).
- recalculateChannels() proc moved to radios instead of just headsets.
- Removed the duplicated recalc proc for borg radios.
- Moved the translate vars to radios as well.
- The syndicate headset subtype has been removed in favor of using the
make_syndie() proc on it instead.
2014-11-04 10:46:18 -06:00
GunHog
604bc648ff
Gives Traitor AIs the Syndicate Channel!
...
This PR is intended to support #5283 .
- Traitor AIs, when set as a traitor, will be given a new internal radio
calibrated to hear and transmit to the encrypted syndicate frequency.
Since traitors can buy a headset key for getting the Syndicate Channel,
Traitor AIs can get one too, as they cannot purchase their own TC items.
2014-11-03 21:59:36 -06:00
hornygranny
de22ca7aac
Merge pull request #5354 from optimumtact/patch-1
...
Remove click delay from pipe painter and adds adjacency check
2014-11-03 17:44:29 -08:00
hornygranny
8b4ab665cb
Merge pull request #5490 from tkdrg/hiasl
...
Nanotransen Relay Chat
2014-11-03 17:26:53 -08:00
Cheridan
51eae4c5a2
Merge pull request #5601 from phil235/ObjVerbCheckFix
...
Adding checks for stun, restrained to many object verbs.
2014-11-02 11:34:48 -06:00
Cheridan
ef29aaef57
Merge pull request #5598 from phil235/PDAsoundFix
...
Fix lack of sound when non-silent PDA receives a message.
2014-11-02 10:26:28 -06:00
tkdrg
30841b5f37
Merge remote-tracking branch 'upstream/master' into hiasl
...
Conflicts:
code/modules/research/message_server.dm
2014-11-01 20:04:26 -03:00
phil235
128c9222e5
Adding checks for stun, restrained to many object verbs.
...
Fixing paper and supply manifest description upon examination.
Fixing being able to adjust jumpsuit while restrained.
Fixing one typo.
2014-11-01 19:18:01 +01:00
phil235
4803f099f6
Fix lack of sound when non-silent PDA receive message.
2014-11-01 15:32:48 +01:00
Remie Richards
dfda08cc63
Merge branch 'master' of https://github.com/tgstation/-tg-station into DiseaseRework
...
Conflicts:
code/game/machinery/bots/medbot.dm
2014-10-30 06:32:13 +00:00
Remie Richards
fa184f5487
Cuts /disease variables from 28 to 23 (includes new ones)
...
a disease may now have more than one spread type
added "infectivity" variable which replaces a prob(65), defaults to 65
affected_species is now viable_mobtypes, and lists typepaths, this is due to us actually having a species system now so it's confusing
adds defines for a bunch of stuff
2014-10-30 06:21:14 +00:00
tkdrg
7db4f1f9a2
Fixes chat channel bugs, removes PDA authentication because apparently our players are too dumb to not share passwords between ss13 and banking accounts
2014-10-29 23:00:23 -03:00
tkdrg
cc96d09843
Adds NTRC help screen, fixes PDA /join bug that let you join multiple times without updating chat_channel
2014-10-29 20:50:08 -03:00
tkdrg
571a0953b4
Fixes chatroom runtime (thanks Gun Hog!), auto-adds # if the channel does not contain it already, obsoletes /new (its functionality is now included in /join)
2014-10-29 20:17:16 -03:00
tkdrg
ab6ca61e2a
Lets AIs and pAIs use the chatroom function in their built-in PDAs.
2014-10-29 19:32:23 -03:00
GunHog
a216b7024e
Merge remote-tracking branch 'remotes/upstream/master' into AI_Radio
...
Conflicts:
code/modules/mob/living/silicon/ai/ai.dm
2014-10-28 23:53:26 -05:00
tkdrg
90d9dddf39
Merge remote-tracking branch 'upstream/master' into hiasl
...
Conflicts:
code/modules/client/client procs.dm
2014-10-29 01:27:08 -03:00
tkdrg
3a862deb6b
Adds chatroom logging (both admin and IC).
2014-10-29 01:20:53 -03:00
Cheridan
1aef19c835
Merge pull request #4974 from GunHog/Botcall_TG_Edition
...
Botcall, TG edition!
2014-10-28 22:17:35 -05:00
Francis Devine
826d81555e
Delete changelog and remove unused on variable
2014-10-29 09:04:34 +13:00
GunHog
19ab2c4a2b
Logic fix + Tweaks
...
- Corrects the logic for when the AI can speak on its radio.
- Added a missing "-" to the radio instructions.
- Removed an unneeded feedback line for toggling the AI's radio via
intellicard.
2014-10-28 10:23:56 -05:00
tkdrg
4d79788e24
Removes the <font> from NTRC errors
2014-10-27 11:46:19 -03:00
tkdrg
314617ea6d
PDAs now have a Nanotransen Relay Chat client
2014-10-27 11:22:40 -03:00
GunHog
d5081c07b9
Teaches GunHog how to spell!
...
"Disnable" -> "Disable"
2014-10-26 20:05:49 -05:00
tkdrg
ce73323823
Fixes #4311
2014-10-25 23:01:27 -03:00
