Mloc-Argent
cf15517f8a
fix up airless turfs to be actually airless
...
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2014-12-21 20:36:11 +00:00
Ccomp5950
8d65f8a87a
Merge pull request #7175 from atlantiscze/pewPEWPEWboom
...
[Ready To Merge] Emitter update
or how I might learn to love the revert button.
2014-12-16 21:17:54 -05:00
PsiOmega
8aa5ee4d9a
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2014-12-15 08:58:28 +01:00
PsiOmega
f65ac4350f
Merge remote-tracking branch 'upstream/master' into dev-freeze
2014-12-15 08:56:11 +01:00
PsiOmegaDelta
845b858045
Merge pull request #7466 from GinjaNinja32/ninjas
...
Removes ninja mask, fixes ninja internals, fixes non-ninja voice changer
2014-12-15 08:53:05 +01:00
GinjaNinja32
f6b5edc130
Fixes error in rig voice-changer message
2014-12-15 05:39:00 +00:00
GinjaNinja32
1eddd1fea9
Span classes
2014-12-15 05:36:35 +00:00
PsiOmegaDelta
213d042f58
Merge pull request #7460 from mwerezak/stance
...
Fixes #7406
2014-12-14 10:08:41 +01:00
GinjaNinja32
16a7e2a4b9
Removes ninja mask, fixes ninja internals
2014-12-14 07:02:28 +00:00
Zuhayr
920ede6767
Merge pull request #7458 from mwerezak/chem-colours
...
Fixes colour mix up
2014-12-14 13:09:12 +10:30
mwerezak
1546d9f293
Fixes #7406
2014-12-13 19:56:11 -05:00
mwerezak
e01d056b75
Fixes #6240
2014-12-13 19:50:28 -05:00
mwerezak
bef305dff1
Fixes handle_organs() being called twice in Life()
2014-12-13 19:50:12 -05:00
PsiOmega
efb6adb452
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2014-12-14 00:27:16 +01:00
mwerezak
c554f70d88
Fixes colour mix up
...
Somehow phoron got the colour meant for inaprovaline.
2014-12-13 17:54:30 -05:00
SparklySheep
dfbe05ff8b
Fixes a typo in the Hydroponics reagents
2014-12-13 14:59:56 -06:00
Chinsky
9536a92d60
Merge pull request #7442 from PsiOmegaDelta/CultGhost
...
Cult Ghost Manifestation
2014-12-13 17:06:10 +03:00
PsiOmegaDelta
0bba4e6f68
Merge pull request #7441 from sabiram/dev-freeze
...
Adds 'me' hotkey again, corrects hotkeys-help, typo fixes.
2014-12-13 14:59:41 +01:00
Zuhayr
d2803ec4d7
Merge resolution.
2014-12-13 23:10:46 +10:30
Zuhayr
7efae862a2
Fixes #7290
2014-12-13 23:04:13 +10:30
Zuhayr
c569d52700
Fixes pretzels being unmakable (use a poppy instead of the seeds)
2014-12-13 22:46:55 +10:30
Zuhayr
02fefbff54
Fixes #7345
2014-12-13 22:37:22 +10:30
Zuhayr
0ce52b086a
Fixes #7371
2014-12-13 22:32:35 +10:30
Zuhayr
2569fdc1c2
Fixes #7437
2014-12-13 21:58:06 +10:30
Zuhayr
9b51078fdf
Fixes #7410
2014-12-13 21:57:51 +10:30
Zuhayr
8c3d179e78
Merge pull request #7434 from PsiOmegaDelta/World
...
Removes world messages.
2014-12-13 19:42:28 +10:30
Zuhayr
36f78ae38e
Merge pull request #7430 from PsiOmegaDelta/Accounting
...
Fixes #7427 .
2014-12-13 19:42:01 +10:30
Zuhayr
4a14e25026
Merge pull request #7426 from PsiOmegaDelta/NoIconLabCoat
...
Fixes labcoat without icon.
2014-12-13 19:39:23 +10:30
PsiOmegaDelta
009314a448
Merge pull request #7438 from mwerezak/chem-colours
...
Replaces dummy reagent colours
2014-12-13 09:17:37 +01:00
Zuhayr
cd096fd45b
Merge pull request #7385 from Zuhayr/dev-freeze
...
Reverts colours and catwalks.
2014-12-13 12:25:13 +10:30
PsiOmega
9c6adfe590
Cult Ghost Manifestation
...
Turns out ghosts could be pulled into reality in two places.
This ensures both use the same method.
2014-12-13 00:13:55 +01:00
mwerezak
6aa2c09fcf
Replaces dummy reagent colours
2014-12-12 16:06:16 -05:00
sabiram
953f365292
Adds 'me' hotkey again. Pedantic spelling changes.
2014-12-12 15:44:22 -05:00
PsiOmega
3eef1796d2
Removes world messages.
2014-12-12 19:49:30 +01:00
Zuhayr
45c79a0ed7
Merge pull request #7423 from Loganbacca/cablefix
...
Cable rendering fix
2014-12-13 05:11:48 +10:30
Zuhayr
f980a97b1d
Merge pull request #7424 from PsiOmegaDelta/Examinate
...
Allows observers to face what they examine/point at.
2014-12-13 05:11:34 +10:30
D Anzorge
fe32bdc9a2
Fix bug making it impossible to detach voidsuit boots
2014-12-12 11:50:11 -05:00
PsiOmega
f5602de811
Fixes #7427 .
...
Station funds can no longer go into the negative from creating a new account.
Limits how much/little money a single account is allowed.
2014-12-12 15:43:29 +01:00
PsiOmega
b9ce5404d8
Fixes lab coat without icon.
...
Simply by changing it to the new labcoat variant that can be closed/opened.
Still created a proper definition for the old lab coat, /obj/item/clothing/suit/storage/labcoat, as it's inherited by custom gear.
2014-12-12 14:30:12 +01:00
PsiOmega
4eb1eb5abc
Removes now redundant face_at checks, allows observers to face.
...
Was initially an attempt to fix lying mobs being unable to change facing to but https://github.com/Baystation12/Baystation12/blob/master/code/modules/mob/mob.dm#L764 complicates this.
2014-12-12 12:56:50 +01:00
Loganbacca
2ff0a2bf5d
Revert updateicon changes
...
- Fixes cable T-Ray rendering caused by /tg/ powernet code port
2014-12-13 00:10:30 +13:00
PsiOmegaDelta
012d2739d4
Merge pull request #7407 from Amunak/patch-1
...
Fixes dead join/leave message format.
2014-12-12 10:51:01 +01:00
PsiOmega
2e34cb79a5
Morphic Clerical Kit
...
Buy the morphic chameleon stamp (or Stmap) now and get a new pen which fakes signatures for free.
Attempts to improve the value of said chameleon stamp as it feels rather expensive for what it do.
2014-12-12 10:07:42 +01:00
PsiOmega
cf78fe903b
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2014-12-12 09:04:09 +01:00
Zuhayr
9d2fc50e75
Merge pull request #7397 from PsiOmegaDelta/TotallyRad
...
Halves radiation storm duration.
2014-12-12 14:14:02 +10:30
Zuhayr
b1ff8a8d70
Merge pull request #7394 from PsiOmegaDelta/SMES
...
Fixes #7293 (or tries to)
2014-12-12 14:13:20 +10:30
Zuhayr
b90b135010
Merge pull request #7393 from PsiOmegaDelta/DeclaringReady
...
Ready-button consistency.
2014-12-12 14:12:38 +10:30
Zuhayr
8ccca9a020
Merge pull request #7379 from PsiOmegaDelta/Stalkerism
...
Fixes #7366 .
2014-12-12 14:10:55 +10:30
Zuhayr
44b23fe1b5
Merge pull request #7370 from Hubblenaut/dev-freeze
...
Context-based Combat Fixes
2014-12-12 14:10:23 +10:30
Amunak
f1a596e168
Fixes dead join/leave message format.
...
Fixes dead join/leave message format when the mind name is empty.
It used to show ' (Character Name) no longer...' instead of 'Mind Name (Character Name)' where appropriate.
2014-12-11 22:10:22 +01:00
