Jordie
2bb0f348f4
notice > warning
2014-09-15 18:25:16 +10:00
Jordie
dd39346563
[name]ifies messages and removes debug item
2014-09-15 18:24:34 +10:00
Jordie
cd2cdde82e
Spans unlinked message
2014-09-15 18:21:52 +10:00
Jordie
ef95f0094f
Added span + [name]
2014-09-15 18:19:58 +10:00
Alex
b5423346e4
Merge pull request #4307 from Zelacks/alienimagefix
...
Fix for Alien Infection Image
2014-08-08 15:12:37 +01:00
Swag McYolosteinen
aaf1ceba1e
Merge pull request #4353 from Firecage/machineryabsolutes
...
Absolute paths for some machinery files.
2014-08-08 12:38:18 +02:00
Swag McYolosteinen
524a5fe848
Merge pull request #4351 from Firecage/somemorefileabsolutes
...
Some more absolute paths for some gamemode files
2014-08-08 12:31:07 +02:00
Firecage
cd35cbfbde
Thanks MIAUW!
2014-08-08 12:26:08 +02:00
Swag McYolosteinen
7225c1fb41
Merge pull request #4350 from Firecage/absolutepathsforsomefiles
...
Absolutepathsforsomefiles
2014-08-08 12:18:22 +02:00
Swag McYolosteinen
1177b3f3ad
Merge pull request #4348 from Firecage/NANOABSOLUTES
...
Nanoabsolutes
2014-08-08 12:16:13 +02:00
Swag McYolosteinen
63692588b9
Merge pull request #4346 from Firecage/FUCKINABSOLUTEPATHS
...
CLUCKING ABSOLUTE PATHS
2014-08-08 12:15:22 +02:00
MrStonedOne
c00a76beab
SQL injection fix.
...
Google sanitizing sql input. almost every single article explains why you should never attempt to roll your own function to do this.
2014-08-08 00:15:33 -07:00
Firecage
82812b744f
Merge branch 'master' of https://github.com/tgstation/-tg-station.git into somemorefileabsolutes
2014-08-07 12:51:53 +02: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
Firecage
055b17bc5f
Absolute paths for some machinery files.
2014-08-06 23:21:24 +02:00
Firecage
369e346a9e
Some more absolute paths for some gamemode files
2014-08-06 22:39:11 +02:00
Firecage
08a38f6af9
Cleaning up
2014-08-06 22:17:01 +02:00
Firecage
129865d565
Giacom Fixes
2014-08-06 20:22:36 +02:00
Firecage
3bc531e98b
Absolute paths for some gamemode files.
2014-08-06 20:15:37 +02:00
Firecage
4402d30f10
Merge branch 'master' of https://github.com/tgstation/-tg-station.git
...
FUCK SPACES
Merge branch 'AIcode'
Merge branch 'Foodstuffssss'
Merge branch 'master' of https://github.com/tgstation/-tg-station.git
Merge branch 'girderwrenchtime'
Merge branch 'Chamjumpsuit'
Merge branch 'Bookcasefix'
Merge branch 'Assemblyfix'
Merge branch 'metroidbegone'
Merge branch 'master' of https://github.com/tgstation/-tg-station.git
Merge branch 'master' of https://github.com/tgstation/-tg-station.git
FUCKING ABSOLUTE PATHS
Absolute paths for 3 nanoUI files
...
...
2014-08-06 20:15:37 +02:00
Firecage
9732b3a254
Absolute paths for 3 nanoUI files
...
...
...
2014-08-06 19:02:30 +02:00
Firecage
8ee10c4940
Merge branch 'master' of https://github.com/tgstation/-tg-station.git
...
FUCK SPACES
Merge branch 'AIcode'
Merge branch 'Foodstuffssss'
Merge branch 'master' of https://github.com/tgstation/-tg-station.git
Merge branch 'girderwrenchtime'
Merge branch 'Chamjumpsuit'
Merge branch 'Bookcasefix'
Merge branch 'Assemblyfix'
Merge branch 'metroidbegone'
Merge branch 'master' of https://github.com/tgstation/-tg-station.git
Merge branch 'master' of https://github.com/tgstation/-tg-station.git
FUCKING ABSOLUTE PATHS
2014-08-06 19:02:28 +02:00
Firecage
40de38f252
moremoarmoaaaaarabsolutes
2014-08-06 16:54:06 +02:00
Firecage
24972ccc5c
ABSOLUTELY ABSOLUTE
2014-08-06 16:21:24 +02:00
Firecage
510b20a8e5
MoarABSOLUTEPATHS
2014-08-06 15:51:40 +02:00
Firecage
88be87e8d3
FUCKING ABSOLUTE PATHS
2014-08-06 15:15:56 +02: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
Zelacks
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
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
