paprka
64bc2abec3
sprite and fix
2014-08-07 14:52:40 -07:00
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
c79b9fe6bf
Merge pull request #4336 from Incoming5643/bluepanties
...
Magic Mania 1⅔: Fixes #4335
2014-08-06 10:41:07 +01:00
Incoming
879f5d7c0e
Changed it!
2014-08-05 19:51:08 -04:00
Incoming
4e91b2b655
Simplifies the species picking
...
Adds an update_icons() to minimize the effects of #4252 , but it's still a problem
2014-08-05 14:11:45 -04: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
4bcb228ea3
Merge pull request #4320 from MrPerson/MM7_Junk_Man
...
Fixes that "temporary black screen on deletion" issue for disposals
2014-08-05 10:22:15 +01:00
Incoming
2283b303ac
Fixes #4335
...
Readds the 1/12 chance of stumbling out the bolt of change fully human with no mutantrace. It must have gotten lost during the mutantrace datumizing
2014-08-04 17:51:33 -04:00
Alex
7946e96fcb
Merge pull request #4326 from Aranclanos/strippanel
...
Strip panel.
2014-08-04 09:26:24 +01:00
Alex
ff84e58ad6
Merge pull request #4321 from Incoming5643/tincans
...
Fixes #2738
2014-08-04 09:24:47 +01:00
Alex
0adf11b9d5
Merge pull request #4319 from MrPerson/only_the_dead_know_peace_from_this_evil
...
Sanity check to prevent ghosts from going to nullspace
2014-08-04 09:21:56 +01:00
Alex
15fbeb7dc0
Merge pull request #4299 from Jordie0608/turnsoutcentcommisracisttowardsalienlifeforms
...
Fixes #2967 Blobs prevent supply shuttle from moving
2014-08-04 09:20:56 +01:00
Alex
f0332f190f
Merge pull request #4313 from Aranclanos/MedicalComputer
...
pretty records
2014-08-04 09:20:33 +01:00
Alex
e36d24d830
Merge pull request #4317 from Aranclanos/F12button
...
F12 feedback text small change
2014-08-04 09:20:15 +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
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
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
Incoming
ac0a1d1813
Fixes #2738
...
Only 6 months later than I could have fixed it!
#FreeTheTinCans
2014-08-02 23:29:41 -04:00
MrPerson
7473daf467
Fixes that "temporary black screen on deletion" issue for disposals
2014-08-02 18:47:00 -07: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
MrPerson
1a991974e1
Sanity check to prevent ghosts from going to nullspace
...
Fixes #4310
2014-08-02 17:36:03 -07:00
Aranclanos
76a709cda2
Changes the message of the F12 button to toggle the HUD, adding a string mentioning that you need to use F12 to use it, in case of pressing it by accident. (Yes it happens)
2014-08-02 20:52:22 -03: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
Alex
1e6603a2b7
Merge pull request #4289 from cookingboy3/asay
...
Admin notification when emitter loses power.
2014-08-01 09:24:45 +01: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
Jordie
3fbfaf3ba7
Added spiderlings to exclusion
2014-08-01 05:00:01 +10:00
KyrahAbattoir
1b2c95a81c
Merge branch 'master' into ItemNameFixing07-2014
2014-07-31 18:54:38 +02:00
Jordie0608
b2641f9af6
Adds away missions to readme.md
2014-07-31 21:54:55 +10:00
Jordie
802c5f347c
Blobs prevent supply shuttle from moving
2014-07-31 20:05:46 +10:00
AndroidSFV
817278e5ad
Resin walls and weeds cannot be mash-attacked.
2014-07-30 21:04:34 -05:00
cookingboy3
64131818d8
fix for #4243 , adds notification
...
squashed commits
2014-07-30 11:00:31 -07: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
paprka
23a8609d99
typo!
2014-07-29 16:32:43 -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
21768c5ab0
indentations and such
2014-07-29 11:46:31 -07:00
paprka
d992c907c6
goodbye rigsuits my old friends
2014-07-29 11:43:34 -07:00
