paprka
726b939754
whole bunch of gun stuff
2014-08-07 14:39:31 -07:00
paprka
3b31436e43
conflict
2014-08-06 15:30:45 -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
045c53d41b
Merge pull request #4323 from Aranclanos/OpenTheWorld
...
opening/closing powerless machines
2014-08-05 10:22:33 +01:00
Alex
f0332f190f
Merge pull request #4313 from Aranclanos/MedicalComputer
...
pretty records
2014-08-04 09:20:33 +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
0ad9b394d5
Merge pull request #4296 from AndroidSFV/alienwallbuff
...
Resin walls and weeds cannot be mash-attacked.
2014-08-03 21:46:22 -03:00
Aranclanos
3fbb78b997
Medical records on the medical computer:
...
-Changes my last commit, the 'e' button will never see daylight.
-Added some ' ' on the links to prevent the link to disappear when the string is empty.
2014-08-03 18:35:58 -03:00
Alex
12ad234e75
Merge pull request #4316 from Miauw62/extremely_creative_branch_name
...
Stops slot machines from eating coins.
2014-08-03 20:15:40 +01:00
Aranclanos
23489d5371
Sleepers, cryo tubes and DNA scanners now open and close without power by just clicking on them.
...
Switched the "Sleeper status" and the "Injectors" position of the sleepers UI to stop the missclicks while using the console.
Cryo tubes will turn off automatically if they are open in all cases, they'll stop closing and activate instantly this way.
2014-08-03 05:19:55 -03:00
MrPerson
5b0aba0e67
Merge pull request #4262 from kyrahabattoir/ItemNameFixing07-2014
...
Another lowercasing pass on a bunch of items and furnitures.
2014-08-02 18:02:50 -07:00
Swag McYolosteinen
7c24f99d61
Stops slot machines from eating coins.
2014-08-02 18:53:01 +02:00
Aranclanos
4ebe887b5c
fixes issue #1489
...
Added [e] buttons to edit the strings of the medical records in the medical computer.
The medical records should look prettier and easier to read in the medical computer.
Fixed a bug where you couldn't edit the DNA string of the medical records on the medical computer.
2014-08-01 22:26:59 -03:00
Cheridan
c74601646a
Merge pull request #4287 from AndroidSFV/taperecorderfix
...
Fixes a minor span class in tape recorder
2014-07-31 22:28:27 -05:00
KyrahAbattoir
1b2c95a81c
Merge branch 'master' into ItemNameFixing07-2014
2014-07-31 18:54:38 +02:00
AndroidSFV
817278e5ad
Resin walls and weeds cannot be mash-attacked.
2014-07-30 21:04:34 -05:00
Alex
589d38660a
Merge pull request #3967 from CollenN/radscanner
...
Adds Radioactive Microlaser to Traitor Arsenal
2014-07-30 10:13:10 +01:00
Alex
f2c196e4b1
Merge pull request #4273 from MrPerson/open_says_me
...
Make deleted sleepers kick the occupant out properly
2014-07-30 10:10:24 +01:00
Alex
7b2782ac7b
Merge pull request #4282 from paprka/table
...
Fixed moving between adjacent tables
2014-07-30 10:08:56 +01:00
paprka
265b4db7d4
one more pass
2014-07-29 16:59:20 -07:00
paprka
eea9ae50ad
merging
2014-07-29 16:50:21 -07:00
Alex
8cd91c9888
Merge pull request #4270 from AndroidSFV/Monkeyintercept
...
Monkey Mode Intercepts
2014-07-29 21:06:23 +01:00
AndroidSFV
99e7957db0
Fixes a minor span class in tape recorder
2014-07-29 14:59:51 -05:00
AndroidSFV
629d3a3edc
Moved intercept to the parent post_setup
2014-07-29 14:56:48 -05:00
Alex
6b7b5294f1
Merge pull request #4272 from MrPerson/DoorsDoorsDoors
...
Make airlocks weldable again
2014-07-29 20:29:36 +01:00
paprka
d992c907c6
goodbye rigsuits my old friends
2014-07-29 11:43:34 -07:00
paprka
056289a273
fixed moving between adjacent tables
2014-07-29 09:12:01 -07:00
Cheridan
c51184de24
Merge pull request #4268 from Firecage/Assemblyfix
...
New names of medbot and securitron assemblies.
2014-07-28 20:21:47 -05:00
MrPerson
40548613e4
Make deleted sleepers kick the occupant out properly
...
Fixes #4244
Also changes sleeper/ex_act() a tiny bit because it bothered me while I had the file open.
2014-07-28 17:13:33 -07:00
MrPerson
c59dfb410b
Make airlocks weldable again
2014-07-28 13:26:16 -07:00
AndroidSFV
87d5ce33c4
Give the monkey mode an intercept, because the lack of it is meta~
2014-07-28 12:30:31 -05:00
Alex
feccf4e6ce
Merge pull request #4266 from Firecage/girderwrenchtime
...
You cannot instant wrench dislodged girders.
2014-07-28 10:04:34 +01:00
KyrahAbattoir
fcb2fb9de3
Another lowercasing pass on a bunch of items and furnitures.
...
Synthflesh should be a plural.
Leg cuffs is better than legcuffs.
LaserTag -> laser tag is not a brand name.
centcom -> Centcom is always capitalised.
2014-07-27 19:14:40 +02:00
Firecage
7a68a1f9e1
Fix for stupid names.
2014-07-27 15:54:17 +02:00
Firecage
2df25335e2
You cannot instant wrench dislodged girders.
2014-07-26 23:25:01 +02:00
Alex
45c33db77d
Merge pull request #4020 from caelaislinn/bugfix
...
Various bugfixes
2014-07-26 17:59:07 +01:00
Alex
128cb7d9c7
Merge pull request #4124 from MrPerson/qdel_mecha
...
Fixes some issues with mechs getting deleted
2014-07-25 09:25:55 +01:00
Alex
80b1e03c91
Merge pull request #4216 from Firecage/Foodstuffssss
...
Making food code less bloated and messy.
2014-07-25 09:24:11 +01:00
Alex
3ecf0fcc04
Merge pull request #4203 from MrPerson/track_bugs
...
AI Tracking bugfixes
2014-07-25 09:23:54 +01:00
Alex
0bce669482
Merge pull request #4217 from A-t48/MechaNorthStar
...
Fix #3821 Attacking mechas has no click cooldown
2014-07-25 09:22:58 +01:00
Cheridan
1e7a737a06
Merge pull request #4145 from Ergovisavi/faction_check
...
Changes faction to list
2014-07-22 19:10:53 -05:00
Kyle Franz
94bde48ac3
Expanding comments
2014-07-22 15:41:54 -07:00
Kyle Franz
cb7cbc74e7
Cooldown on attacking a mech even if your weapon deflects
2014-07-22 15:38:04 -07:00
Kyle Franz
1e691d2b26
Fix #3821 Attacking mechas has no click cooldown
2014-07-22 15:27:00 -07:00
MrPerson
e521a67a12
Giacom's suggestions, plus removing more pointless checks.
...
You can now type track foo as an AI and it'll track foo or expand into a full listing if ambiguity exists. It's not track-with-camera, just track.
2014-07-22 08:00:57 -07:00
Firecage
4f2dbf2868
Making food code less bloated and messy.
2014-07-22 16:47:06 +02:00
Alex
e4de28b13e
Merge pull request #4170 from RemieRichards/FixDoorLockerWeld
...
Fixes Permanent Airlock welding, adds sound to dismantling a locker
2014-07-22 15:18:32 +01:00
Alex
172322c0ad
Merge pull request #4192 from paprka/sleepyfix
...
Fixes miauw's parapen laziness
2014-07-22 15:16:46 +01:00
Alex
ab98b7e94d
Merge pull request #4209 from paprka/ebinperiodbro
...
Fix extra period from objective
2014-07-22 08:06:19 +01:00
