ikarrus
8496ec8dd1
Should be auto-mergable again
2014-05-14 08:57:52 -06:00
Alex
bcac0812c5
Merge pull request #3585 from Aranclanos/ViolinAndPiano
...
canUseTopic()
2014-05-14 11:05:17 +01:00
Alex
0d531eacf6
Merge pull request #3543 from paprka/stechupdate
...
Adds Stechkin pistol and Bond bundle to traitor uplink
2014-05-14 10:51:46 +01:00
Alex
084510a743
Merge pull request #3391 from Donkie/sofa
...
Sofa / Comfychair update
2014-05-14 10:37:06 +01:00
Alex
0eb1af3331
Merge pull request #3659 from AnturK/stuffz
...
Fixes one-way locks
2014-05-14 09:58:05 +01:00
Alex
66feb77503
Merge pull request #3677 from Kelenius/dualsaberfix
...
Fix for #2660 : clowns killing themselves with toy dualsabers
2014-05-14 09:27:37 +01:00
Alex
6686b2ec7c
Merge pull request #3687 from Jordie0608/removerelativepathsfromtheeverythingplz
...
Fixes #3681 : suicide messages when crit
2014-05-14 09:24:29 +01:00
fleure
e13ab9422d
Merge pull request #3610 from Aranclanos/washingmachine
...
Washing machine fixes
2014-05-13 16:55:26 +01:00
Jordie0608
5b94391e6f
Unidentinization^2
2014-05-13 02:25:14 +10:00
Jordie0608
4078973a5c
Unidentinization
2014-05-13 02:18:21 +10:00
Jordie0608
dfd2cc4b60
Changed suicide messages to visible_messages and fixed relative pathing
2014-05-13 01:44:29 +10:00
Kelenius
07b90d21bd
Yes. Lowercase. How could I forget.
2014-05-11 23:33:46 +04:00
Kelenius
a76d067b3a
Attempt two
2014-05-11 00:45:59 +04:00
Kelenius
63a9c5b5af
Fixed hurting yourself with toy double esword while clumsy
2014-05-10 19:47:29 +04:00
ikarrus
b3d1e87b1f
Merge branch 'master' of https://github.com/tgstation/-tg-station into documents
2014-05-08 20:18:57 -06:00
Miauw62
a0279416f1
Merge pull request #3647 from Jordie0608/msoisatheifhalthalthalthalt
...
Changed mining equipment locker to mining equipment vendor
2014-05-07 17:25:22 +02:00
AnturK
03c183bb7d
Fixes one-way locks
2014-05-07 11:33:56 +02:00
Cheridan
bd2756c36a
Merge pull request #3580 from argoneuscze/fixshowerfire
...
Fix shower not extinguishing fires
2014-05-06 19:46:57 -05:00
Alex
5d39b2f5c2
Merge pull request #3524 from phil235/ShardFeetFix
...
Fix for stepping on shard
2014-05-06 20:01:10 +01:00
Jordie0608
6530150120
Changed mining equipment locker to mining equipment vendor
2014-05-06 20:01:01 +10:00
Cheridan
9ae36480b2
Merge pull request #3618 from kyrahabattoir/ItemNameFixingRound4
...
More name fixing, lowercasing objects, proper-ing unique objects, plural...
2014-05-05 11:46:35 -05:00
Razharas
282a5d3a2b
Merge pull request #3379 from Cheridan/sliceofpai
...
Refactors pAI law code...
2014-05-05 07:33:17 -07:00
ikarrus
58b2ff1671
-Removed some duplicate code
...
-Made the syndicate document names appear like codenames
2014-05-04 16:18:48 -06:00
ikarrus
82639d14a6
Secret Document Objectives
...
Adds new steal objective "Secret Documents"
-A set of secret documents spawn in the vault's filing cabinet, but even syndicate documents qualify as valid steals
Adds the exchange objective for traitors
-If there are at least 6 traitors, two of them will be selected to make an exchange of secret documents
-There is a low (20%) chance that one of them will have an additional backstab objective, where they will require both sets of documents to win
2014-05-04 15:00:47 -06:00
Alex
6d337e760b
Merge pull request #3592 from Aranclanos/reisinsuperconductivity
...
Reisin walls and doors will now block superconductivity (heat)
2014-05-03 23:11:13 +01:00
Miauw62
5e6d59d95f
Merge pull request #3605 from phil235/DualsaberSoundFix
...
Fixes the lack of hitsounds for the dualsaber.
2014-05-03 16:30:09 +02:00
Miauw62
eec72aa516
Merge pull request #3472 from Menshin/missing_nodrop
...
Nodrop checks for several machines/structures
2014-05-03 15:44:26 +02:00
Alex
09f112c9cb
Merge pull request #3572 from Aranclanos/evidencebags
...
Heil myself
2014-05-02 17:46:04 +01:00
Alex
64073f0a8d
Merge pull request #3489 from Aranclanos/ChemGrenades
...
Chem grenades asay logs improvements
2014-05-02 17:45:11 +01:00
Alex
b3b54d2561
Merge pull request #3607 from phil235/WindowDestroySoundFix
...
Fixes the lack of sound when smashing window
2014-05-02 17:40:37 +01:00
Kyrah Abattoir
997e1310c5
More name fixing, lowercasing objects, proper-ing unique objects, plural-ing some stuff that needs it.
2014-05-01 23:07:35 +02:00
Aranclanos
b544a945a9
Fixes issue #2489
...
Fixes issue #119
Transferred all the different colours of under clothes and shoes to obj/item/clothing/under/colour/XXX and obj/item/clothing/shoes/sneakers/XXX
Added two extra options to the spawn menu of the game panel, clothing and food.
2014-05-01 06:01:14 -03:00
phil235
0233cd3a25
Fixes the lack of sound when smashing window
2014-05-01 01:43:09 +02:00
phil235
19734b93cc
Fixes the lack of hitsounds for the dualsaber.
2014-04-30 23:37:31 +02:00
Aranclanos
cc34aae3e3
Reisin walls and doors will now block superconductivity (heat)
...
Reisin membranes won't
2014-04-30 07:40:41 -03:00
Aranclanos
5736eb1f44
Creates canUseTopic(), a mob proc contained for the moment in the machinery.dm
...
The Topic() proc of machinery will use this.
The first non-machinery item to use this will be the violin and piano.
There are plans to make admin observers use this, to make AIs don't be able to use Topic() when they lose power (doing that currently will break gameplay) and make all items use the canUseTopic() proc if needed.
I just wanted to pull the fix for the piano and violin quick, the rest is a todo.
2014-04-30 05:25:01 -03:00
argoneus
d08c9ebc08
Fixed #3571
2014-04-29 21:38:38 +02:00
Aranclanos
129401c403
evidence bags will now use attackby() to add items to themselves
...
removed the preattack() proc
2014-04-29 08:38:51 -03:00
VistaPOWA
19402bd258
Handle alpha 0
2014-04-27 15:57:18 +02:00
VistaPOWA
fcf98c15f9
Checking for divide by zero
2014-04-27 14:41:53 +02:00
VistaPOWA
4c7cbeff08
Fixes bad indent
2014-04-27 14:34:52 +02:00
VistaPOWA
14ad291ba2
Merge remote-tracking branch 'upstream/master' into smoke_fade
2014-04-27 14:16:55 +02:00
VistaPOWA
5a197e8dec
Adds a fancy fade-out for smokes
...
Originally from Bay.
Made by Loganbacca, ported by me.
2014-04-27 14:16:50 +02:00
paprka
d8e6ac64a2
final
2014-04-26 16:31:07 -07:00
phil235
aa2c65aaf4
removing some of my code
2014-04-25 20:44:32 +02:00
Cheridan
a081d487f7
Merge pull request #3424 from Nnelg/Polymorphic-can_equip
...
Polymorphic can_equip
2014-04-24 23:13:58 -05:00
Cheridan
686e879f2e
Merge pull request #3490 from Giacom/fixes_transit_tubes
...
Fixes transit tubes being stuck, it uses process() instead of a spawn'd loop.
2014-04-24 23:07:52 -05:00
Cheridan
892cf5b191
Merge pull request #3505 from MrPerson/who_cleans_those_who_clean_us
...
Runtime fix for the mop
2014-04-24 20:48:52 -05:00
phil235
ff95095446
Fix for shard
2014-04-25 01:11:29 +02:00
Daniel
7e06da72d1
Fixed armrest being an icon instead of image
2014-04-24 18:18:57 +02:00
