nzp-team/quakec
0
0
Fork 0
mirror of https://github.com/nzp-team/quakec.git synced 2025-02-18 01:41:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #59 from tyleryoung88/main

Browse source
This commit is contained in:
cypress 2023-11-30 09:26:08 -05:00 committed by GitHub
commit e50536924b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
source/server/entities/teleporter.qc
View file

@ -250,13 +250,15 @@ void() teleporter_link_touch =
void() teleport_touch = void() teleport_touch =
{ {
entity tempe;
if (self.cooldown) { if (self.cooldown) {
useprint(other, 16, 0, 0); useprint(other, 16, 0, 0);
return; return;
} }
if (other.classname != "player" || self.activated) if (other.classname != "player" || self.activated)
return; return;
if (!isPowerOn) { if (!isPowerOn) {
useprint(other, 8, 0, 0); useprint(other, 8, 0, 0);
@ -295,7 +297,23 @@ void() teleport_touch =
people.tele_target = find(world, targetname, self.target); people.tele_target = find(world, targetname, self.target);
people.movetype = MOVETYPE_NONE; people.movetype = MOVETYPE_NONE;
} }
people = people.chain; else if (people.classname == "ai_dog" && !people.electro_targeted) {
sound(self, CHAN_WEAPON, "sounds/machines/elec_shock.wav", 1, ATTN_NORM);
tempe = self;
self = people;
self.electro_targeted = true;
self.th_die();
self = tempe;
}
else if (people.aistatus == "1" && !people.electro_targeted)
{
tempe = self;
self = people;
Z_ElectroShock();
self = tempe;
}
people = people.chain;
} }
if (!other.tele_target) if (!other.tele_target)