Commit Graph

20902 Commits

Author SHA1 Message Date
Joan Lung 61a219034d Merge pull request #27480 from lzimann/ptgui
Ports pandemic to tgui
2017-05-21 21:07:06 -04:00
kevinz000 b5b2543fdf Fixes pkborg fields not updating location or draining power (#27430) 2017-05-21 20:28:53 -03:00
Leo 795622fac1 Merge pull request #27473 from swindly/monkey_nerf
Nerfs monkeys
2017-05-21 20:28:03 -03:00
Leo 6fa945bdcb Merge pull request #27472 from Wolfie13/critical-grammar-fixes
Minor Grammar Fixes
2017-05-21 20:27:17 -03:00
Joan Lung 4734e711d4 Resonator fields now visually show how long they have until they burst (#27467) 2017-05-21 20:15:38 -03:00
Robustin eb7f2ddc99 Merge branch 'master' of https://github.com/tgstation/tgstation into GG3
# Conflicts:
#	icons/obj/guns/projectile.dmi
2017-05-21 17:54:44 -04:00
Iamgoofball e30edf9df4 Since you can properly scrub Freon now, it doesn't destroy itself. (#27396)
# This was added because I couldn't compile tgui. Therefore, it gets to go away now since scrubbers were fixed.
2017-05-21 15:24:43 -06:00
Steelpoint 7103172e0b Warden Compact Combat Shotgun (#27427)
* InitalCommit

* InitialCommit

* Removal

* CloseEncounters
2017-05-21 13:44:03 -04:00
Leo 70ca3971e3 Merge pull request #27460 from AnturK/meterfix
Fixes built air meters not working
2017-05-21 14:08:02 -03:00
Lzimann 9fcbaf2051 QDEL_NULL and removes a leftover variable 2017-05-21 10:38:32 -03:00
Joan Lung 5c4011befd Merge pull request #27450 from lzimann/fucking
Removes the mess added with recalling with a message
2017-05-21 08:56:17 -04:00
Joan Lung 7db5d150de Adds framework for kinetic accelerator projectiles having module-based effects on-hit (#27380)
* Adds framework for kinetic accelerator projectiles having module-based effects on-hit

* hmmmmm

* we have to do some weird calculation but this is... sort of easier????????

* missed one
2017-05-21 06:16:31 -04:00
RandomMarine 15c35e648d Changed law 3 (#27452) 2017-05-21 06:07:24 -04:00
KorPhaeron 7942aa4e5b Two more types of Legion and makes environment_smash levels into defines (#27160)
One is another small legion, but it can infest corpses, meaning it will revive other legions if you don't kill it first.

The other is a legion that creates legions. I imagine it as something super edgy like a golem made up of legions melded together.

I need sprites for both of these

Added defines for environment_smash
2017-05-21 19:51:52 +12:00
Joan Lung 7d25557bde Survival pod doors will properly turn if on shuttles (#27444) 2017-05-20 23:23:06 -03:00
kevinz000 380ea858fe fixes chameleon laser guns blowing up welding tanks for real this time (#27443) 2017-05-20 23:22:26 -03:00
Lzimann 324f8b56c6 Ports pandemic to tgui 2017-05-20 22:30:59 -03:00
Robustin 44bcd278dd Merge branch 'master' into ganguns 2017-05-20 19:41:52 -04:00
Joan Lung de45c268ed Merge pull request #27283 from Robustin/gangclothes
Decentralized and Vastly Improved Gang Influence System
2017-05-20 19:36:51 -04:00
Joan Lung fdc88ff612 Merge pull request #27435 from GunHog/Aux_Map_Fix
Aux Base Fixes
2017-05-20 19:33:52 -04:00
swindly 31f2942e8d nerfs monkeys 2017-05-20 18:04:20 -04:00
Will Marshall fbadb2f22d Minor Grammar Fixes 2017-05-20 22:42:18 +01:00
Joan Lung 0fb07d0f5a Proto-kinetic crushers are significantly better (#27379) 2017-05-20 14:41:19 -03:00
AnturK aa95770093 Fixes built air meters 2017-05-20 17:00:54 +02:00
Steelpoint 5e45849c5a Pulse Pistol Recharge Addition (#27426) 2017-05-20 10:39:43 -03:00
Lzimann 49863620f2 Removes the mess added with recalling with a message 2017-05-20 02:32:01 -03:00
oranges be8bcc6c12 Merge pull request #27393 from coiax/annoyed-admirals
Annoyed admirals recalling shuttles
2017-05-20 17:13:13 +12:00
Steelpoint 8b2189aa74 Tactical Energy Gun/ERT Sec Officer Change (#27387) 2017-05-20 01:54:06 -03:00
Joan Lung 5ac9cbe758 Merge pull request #27407 from tgstation/lzimann-patch-1
[s]Paper thing
2017-05-19 22:34:17 -04:00
GunHog 5635a60976 Thanks Kev
Reverts accidental deletion
2017-05-19 16:25:20 -05:00
Leo af9af18e68 Merge pull request #27398 from Cyberboss/patch-85
IsAdminAdvancedProcCall returns FALSE in TESTING
2017-05-19 17:59:39 -03:00
Steelpoint 75d4b25796 Pulse Weapons Sprite Update (#27386) 2017-05-19 15:51:16 -03:00
Cyberboss 21aa98bea0 Ports folders to Initialize (#27388) 2017-05-19 15:48:12 -03:00
Leo 3cb94572fe Merge pull request #27389 from Cyberboss/patch-87
Fixes gravity generator admin spam
2017-05-19 15:47:52 -03:00
Leo 50d4aa58ea min 2017-05-19 14:39:55 -03:00
Joan Lung 9722f0fcf0 Merge pull request #27395 from lzimann/xeno
Fixes having more movespeed when xenos hug themselves
2017-05-19 13:31:47 -04:00
GunHog 597ec214ed Aux Base Fixes
- Fixes Aux Base potentially landing partially outside the map's bounds,
leaving a chunk of it in space.
- Fixes the designator becoming inoperative after failing to lock-on to
a turf.
2017-05-19 10:45:17 -05:00
swindly 8010794724 Adds modified syringe guns (#27276) 2017-05-19 08:24:37 -03:00
Leo 16a95305ee Merge pull request #27385 from kevinz000/patch-154
fixes aimed spells not recharging
2017-05-19 08:20:27 -03:00
Lzimann 88838ce67c Clamp 2017-05-19 08:18:21 -03:00
Leo 08372704d7 Paper thing 2017-05-18 22:23:02 -03:00
4DPlanner c87e6f85ec Merge remote-tracking branch 'upstream/master' into clubbuff 2017-05-18 21:52:31 +01:00
Cyberboss 3564f0cf85 IsAdminAdvancedProcCall returns FALSE in TESTING 2017-05-18 16:25:32 -04:00
Lzimann 521c67389b Fixes having more movespeed when xenos hug themselves 2017-05-18 14:37:54 -03:00
Jack Edge 2a8e81daed Annoyed admirals recalling shuttles
🆑 coiax
add: When a shuttle is called, sometimes an on-call admiral, using
availible information to them, will recall the shuttle from Centcom.
/🆑

This is in essence, a simple IC way for admins to recall the shuttle
if they feel that the shuttle should not come. It's up to them entirely,
the system does not trigger otherwise. They also get to set a cranky
message that is automatically fed back to the crew.

It would be nice if admins used their own judgement if the crew is
evacuating for no real reason, and might send an ERT at the same time to
keep the round going? Who knows, I'm just providing the tools.
2017-05-18 18:09:56 +01:00
kevinz000 16b44c2937 [READY]Peacekeeper cyborg projectile dampening fields, attempt three (#27234)
* fields

* peaceborg dampeners

* hm

* nerfs recharge

* ...

* fffff

* objectively fields

* kinda_working

* why is this not working

* cheep

* bugfixes, adds to robot

* cross doesn't work ;-;

* on border

* appearance

* hi, is this a refactor?

* ffs

* ree

* monitor

* monitor

* hm

* all good

* Update robot_items.dm
2017-05-18 10:53:55 -06:00
Iamgoofball 85d770e855 Fixes obtaining blob chems (#27370) 2017-05-18 10:32:43 -06:00
AnturK 7dd00e28ac Fixes bane runtimes (#27368)
* Fixes bane runtimes

* You're a big typo
2017-05-18 10:31:08 -06:00
kevinz000 6c0f3433a3 Clowns get an automatic self-recharging pie cannon as a traitor item for 10TC (#27241)
* Update pneumaticCannon.dm

* Update uplink_item.dm
2017-05-18 10:27:51 -06:00
Mike Long 0c79d3ff8e Ninja Refactor (#27316)
* Begins converting Ninjas into the new antagonist datum system.  Does not compile.  Work in progress.

* More work towards datumizing ninjas. Still not finished. Now compiles.

* Adds ninja to traitor panel.

* Add objectives now takes an arg for number of objectives.

* Event now actually ninjas the ninja.

* Ninja suit initialization now works.

* Cleans up the suit initialization code some.

* Suit initialization is now action rather than verb based.

* Now properly adds objectives and memories to the mind upon gaining datum.

* Starts to replace ninja verbs with actions.

* Hooks ninja abilities up to action buttons.

* Whoops, missed a verb.  Gloves are next.

* Adds toggle ineraction type action button.

* Changes icons as per ChanglingRain's suggestions.

* Second round of changes for ChanglingRain

* Replaces sleeps with addtimers.  It's ugly, but more CPU efficient.

* Fixes compile errors.

* Fixes compile error, again.
2017-05-18 10:21:26 -06:00