9cfb19f511
Merge pull request #4373 from paprka/deepgunlore
...
Whole bunch of gun-related stuff
2014-08-11 16:25:05 +01:00
12b8bba238
Merge pull request #4362 from paprka/borghailer
...
Adds sec hailer to secborg modules
2014-08-11 14:02:51 +01:00
55a11982da
Merge pull request #4361 from paprka/swatremoval
...
Replaces swat helmet for syndicates
2014-08-11 12:15:56 +02:00
e3c26bfdd1
Merge remote-tracking branch 'remotes/upstream/master' into deepgunlore
...
Conflicts:
code/game/objects/items/weapons/storage/uplink_kits.dm
2014-08-09 16:19:33 -07:00
866bf55b48
Merge pull request #4377 from Jordie0608/ogdensnutgoneflake
...
Fixes #4338 multiple weed nodes on turf
2014-08-09 16:21:32 -03:00
365de76240
Merge pull request #4340 from MrPerson/giacom_was_right_I_should_have_just_deld_mobs
...
Make new_players dereference from their mind when observing
2014-08-09 11:19:07 -05:00
1ed6d7921c
stops doubling of weed nodes
2014-08-09 01:54:16 +10:00
b5423346e4
Merge pull request #4307 from Zelacks/alienimagefix
...
Fix for Alien Infection Image
2014-08-08 15:12:37 +01:00
726b939754
whole bunch of gun stuff
2014-08-07 14:39:31 -07:00
8c4bde6be8
adds secborg hailer
2014-08-07 05:00:10 -07:00
10f6ca8c7e
removes swat helmet
2014-08-07 04:47:55 -07:00
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
c813d9df46
Make new_players GC when observing
...
When observing, that observer would be given their original new_player's mind, but that mind would still have the new_player as its current. This caused the new_player to fail to GC and resulted in the observer's mind's current becoming null.
Fix: Just delete the new_player mind when the player observes. If an admin turns them into a human or whatever, a new mind will be created automatically then.
2014-08-05 18:50:09 -07:00
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
7946e96fcb
Merge pull request #4326 from Aranclanos/strippanel
...
Strip panel.
2014-08-04 09:26:24 +01:00
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
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
5a899fde87
Fixed icons not disappearing on embryo removal
...
Basically for whatever reason I did not see affected mob was a variable
and instead used loc for determining the mob affected by the embryo
Changed it to use affected mob, which actually should fix a lot of
fringe cases where the icon would not remove the correct icon
2014-08-04 04:15:40 +08:00
ac0a1d1813
Fixes #2738
...
Only 6 months later than I could have fixed it!
#FreeTheTinCans
2014-08-02 23:29:41 -04:00
e9a3036ef5
Alien Icon Fixed and revamped
2014-08-01 04:16:43 +08:00
eea9ae50ad
merging
2014-07-29 16:50:21 -07:00
d992c907c6
goodbye rigsuits my old friends
2014-07-29 11:43:34 -07:00
9f4c87bc7c
Merge pull request #4269 from Firecage/metroidbegone
...
Metroid-be-gone
2014-07-28 20:17:03 -05:00
61efb7f100
METROID FUCK OFF
2014-07-28 21:52:55 +02:00
ac978dc8e4
Metroid-be-gone
2014-07-27 19:02:49 +02:00
a08053e0e5
Make holocarp not constantly take damage
...
Someone got min and max mixed up!
2014-07-26 16:39:50 -07:00
45c33db77d
Merge pull request #4020 from caelaislinn/bugfix
...
Various bugfixes
2014-07-26 17:59:07 +01:00
3ecf0fcc04
Merge pull request #4203 from MrPerson/track_bugs
...
AI Tracking bugfixes
2014-07-25 09:23:54 +01:00
1e7a737a06
Merge pull request #4145 from Ergovisavi/faction_check
...
Changes faction to list
2014-07-22 19:10:53 -05:00
1410641259
Merge pull request #4152 from paprka/fugfix
...
Fixes security 'preview' sprites in setup
2014-07-22 15:17:05 +01:00
51e46ef80a
Merge pull request #4211 from Firecage/AIcode
...
Fixes AI code a bit >.>
2014-07-22 15:16:27 +01:00
c0c9702c13
Fuck fucking spaces
2014-07-21 14:56:23 +02:00
feeead99e9
Fixes AI code a bit >.>
2014-07-21 14:21:41 +02:00
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
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
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
b67a751d57
Small fixes for camera lights
2014-07-18 02:44:26 +04:00
b938ad2dde
Camera light uses cameranet and updates on movement now
2014-07-18 02:26:47 +04:00
80824ecac3
Changes light to Giacom's suggestion
2014-07-17 23:59:58 +04:00
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
094d7d139b
Makes camera lights not broken
2014-07-15 20:06:04 +04:00
72423a7bd0
Merge pull request #4059 from Miauw62/goodbyeparapen
...
Replaces the parapen
2014-07-14 12:47:14 +01:00
5deccb030c
Merge pull request #4125 from Jordie0608/mygrandmacheatedconstantlyatsnapwheniwasatoddler
...
AI spacecarp hologram
2014-07-14 09:25:37 +01:00
a2845f7cb9
revert thing
2014-07-13 14:00:28 -07:00
d541b109a8
fixes sec setup sprites
2014-07-13 13:58:52 -07:00
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
0dc8aabd42
Revert "Spinning"
2014-07-13 00:55:18 +01:00
dec8444e12
Merge pull request #4118 from Aranclanos/spinning
...
Spinning
2014-07-12 20:52:55 -03:00
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
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
Swag McYolosteinen
paprka
Aranclanos
Cheridan
Jordie0608
MrPerson
Zelacks
Incoming
Firecage
Kyle Franz
Kelenius
Ergovisavi