paprka
726b939754
whole bunch of gun stuff
2014-08-07 14:39:31 -07:00
paprka
d41a469ff4
Merge branch 'master' of https://github.com/tgstation/-tg-station into goodbyedeadspace
...
Conflicts:
code/game/mecha/mecha.dm
2014-08-06 15:22:56 -07:00
Alex
bec4e856ca
Merge pull request #4327 from Aranclanos/clickcooldowndefine
...
Defines for click cooldown numbers and click cooldown for paper camera spam.
2014-08-05 10:22:52 +01:00
Alex
7946e96fcb
Merge pull request #4326 from Aranclanos/strippanel
...
Strip panel.
2014-08-04 09:26:24 +01:00
Aranclanos
ccae5781c5
added two defines CLICK_CD_RANGE and CLICK_CD_MELEE (4 and 8), replaced all changeNext_move() procs to use these two defines.
...
Added melee click cooldown for paper spam on cameras.
2014-08-03 22:14:56 -03:00
Aranclanos
f5ee1a573a
The set internals button on the strip panel will properly appear if it's on the exosuit.
...
The strip panel should be prettier now.
2014-08-03 17:59:56 -03:00
Incoming
ac0a1d1813
Fixes #2738
...
Only 6 months later than I could have fixed it!
#FreeTheTinCans
2014-08-02 23:29:41 -04:00
paprka
eea9ae50ad
merging
2014-07-29 16:50:21 -07:00
paprka
d992c907c6
goodbye rigsuits my old friends
2014-07-29 11:43:34 -07:00
Cheridan
9f4c87bc7c
Merge pull request #4269 from Firecage/metroidbegone
...
Metroid-be-gone
2014-07-28 20:17:03 -05:00
Firecage
61efb7f100
METROID FUCK OFF
2014-07-28 21:52:55 +02:00
Firecage
ac978dc8e4
Metroid-be-gone
2014-07-27 19:02:49 +02:00
MrPerson
a08053e0e5
Make holocarp not constantly take damage
...
Someone got min and max mixed up!
2014-07-26 16:39:50 -07:00
Alex
45c33db77d
Merge pull request #4020 from caelaislinn/bugfix
...
Various bugfixes
2014-07-26 17:59:07 +01:00
Alex
3ecf0fcc04
Merge pull request #4203 from MrPerson/track_bugs
...
AI Tracking bugfixes
2014-07-25 09:23:54 +01:00
Cheridan
1e7a737a06
Merge pull request #4145 from Ergovisavi/faction_check
...
Changes faction to list
2014-07-22 19:10:53 -05:00
Alex
1410641259
Merge pull request #4152 from paprka/fugfix
...
Fixes security 'preview' sprites in setup
2014-07-22 15:17:05 +01:00
Alex
51e46ef80a
Merge pull request #4211 from Firecage/AIcode
...
Fixes AI code a bit >.>
2014-07-22 15:16:27 +01:00
Firecage
c0c9702c13
Fuck fucking spaces
2014-07-21 14:56:23 +02:00
Firecage
feeead99e9
Fixes AI code a bit >.>
2014-07-21 14:21:41 +02:00
MrPerson
1755ec1db4
Merge branch 'master' of https://github.com/tgstation/-tg-station into track_bugs
...
Conflicts:
code/modules/mob/living/silicon/ai/ai.dm
2014-07-20 03:26:25 -07:00
MrPerson
fb6b7f1225
AI Tracking bugfixes
...
Fixes #4201 by adding a cancel button to the track mob list.
Fixes a runtime that pops up if you double click the "Track Mob" or "Show Camera List" buttons on the AI hud. Problem is that double clicking runs a proc that builds the datum of lists of trackable mobs twice, and then both procs sleep because of input(). When the first track completes it nulls the tracking datum, which causes problems for the second (or more) tracks which expect the tracking datum to not be null. Solution: Keep the datum around and simply rebuild the lists as-needed instead of creating and deleting the tracking datum datum pointlessly.
2014-07-20 03:21:02 -07:00
Kyle Franz
7036ff7735
Fix pressing ready button multiple times when connecting causing the button state to flip back and forth
2014-07-19 21:55:38 -07:00
Kelenius
b67a751d57
Small fixes for camera lights
2014-07-18 02:44:26 +04:00
Kelenius
b938ad2dde
Camera light uses cameranet and updates on movement now
2014-07-18 02:26:47 +04:00
Kelenius
80824ecac3
Changes light to Giacom's suggestion
2014-07-17 23:59:58 +04:00
Ergovisavi
9d643789d8
Fix for issue #4173 , both soulstone mobs (and construct derivatives) and staff of animation mobs (statues included) are now properly tagged with a faction that is unique to the person that created them, stopping a Wizard's animated mimics from attacking his created constructs.
2014-07-17 00:40:24 -07:00
Kelenius
094d7d139b
Makes camera lights not broken
2014-07-15 20:06:04 +04:00
Alex
72423a7bd0
Merge pull request #4059 from Miauw62/goodbyeparapen
...
Replaces the parapen
2014-07-14 12:47:14 +01:00
Alex
5deccb030c
Merge pull request #4125 from Jordie0608/mygrandmacheatedconstantlyatsnapwheniwasatoddler
...
AI spacecarp hologram
2014-07-14 09:25:37 +01:00
paprka
a2845f7cb9
revert thing
2014-07-13 14:00:28 -07:00
paprka
d541b109a8
fixes sec setup sprites
2014-07-13 13:58:52 -07:00
Ergovisavi
ff17e36750
Changes faction to list and edits hostile mobs to use the list type faction, along with changing existing factions to match the new list type
...
Also changes trees and space bats to "hostile" faction because they were copypasta'd carp before that, as well as changing goats to "neutral" and attack_self 1 so that the great mining drone / goat wars end
2014-07-12 20:03:46 -07:00
Alex
0dc8aabd42
Revert "Spinning"
2014-07-13 00:55:18 +01:00
Aranclanos
dec8444e12
Merge pull request #4118 from Aranclanos/spinning
...
Spinning
2014-07-12 20:52:55 -03:00
Miauw
4eb83ed546
Oh, not in cruelty, not in wrath
...
The Reaper came that day;
An angel visited this damned sat,
And took the parapen away.
Replaces parapen with sleepypen that contains 30u of sleeptoxin and 30u of a new mutetoxin that makes you unable to speak.
Mutetoxin can be made with 2 parts uranium + 1 part water + 1 part carbon.
2014-07-12 17:48:33 +02:00
Alex
46c3a61fca
Merge pull request #4071 from CollenN/panelfix
...
Spawned humans have DNA, strip panel is better
2014-07-11 19:02:50 +01:00
Alex
537d135d82
Merge pull request #4113 from SodiumShine/cuffs-fix
...
Fixes handcuffs persisting visually after resist.
2014-07-11 15:02:06 +01:00
Cael_Aislinn
1f0e8baade
humans swapping position via bumping with help intent now calls Crossed()
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2014-07-11 23:16:40 +10:00
A
8bc96dcfdc
check for legcuffs too
2014-07-11 21:12:26 +10:00
A
dde416fdea
Fixed fix for persisting handcuffs sprite (Legcuffs/handcuffs mixup)
2014-07-11 16:16:40 +10:00
A
58c12ae7bb
Merge branch 'master' of https://github.com/SodiumShine/-tg-station into cuffs-fix
2014-07-11 15:34:52 +10:00
GunHog
b313228586
Fixes pAI SecHUDs
...
Replaces "return" with "continue" on line 29. "return" was prematurely terminating the loop, causing pAIs to only see one or a few HUD icons at a time.
I plan to extend these HUDs to the AI in the future, after the freeze.
2014-07-10 09:16:56 -05:00
Jordie0608
4066fe0d1e
ai spacecarp hologram
2014-07-10 23:33:03 +10:00
MrPerson
41d3858769
Make dead people stop jittering
...
Fixes #3690
2014-07-09 02:19:01 -07:00
Aranclanos
83cb25ea41
Added a spinning visual effect to rolling on the floor to extinguish yourself in case of a fire.
...
Lube will now make you spin while you're slipping.
Water will make you slip on the spot and won't move you forward.
Fixed the bug of wrong mob directions when buckling them while they are lying down.
2014-07-09 05:25:12 -03:00
A
1a0b4ac572
Fixes issue where resisting with handcuffs on would leave player sprite handcuffed as well as hand slots.
2014-07-09 00:34:50 +10:00
Cheridan
8288810ff6
Merge pull request #3531 from Rolan7/Issue3401
...
Fixes issue #3401 by adding a "SpeciesCanConsume" helper proc
2014-07-08 01:45:36 -05:00
Cheridan
4574a85b05
Merge pull request #4075 from Incoming5643/super_meat_pull
...
Fixes #4073
2014-07-08 00:49:33 -05:00
CollenN
ccaef08fdc
Moves stuff to New()
...
Alright, I tested it, and this worked, so...
2014-07-07 14:02:58 -04:00
