mwerezak
c554f70d88
Fixes colour mix up
...
Somehow phoron got the colour meant for inaprovaline.
2014-12-13 17:54:30 -05: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
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
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
PsiOmega
95db71f5cd
Drastically reduces radiation storm duration.
...
Numbers were previously based on the assumption that the default number of master ticks were 10 rather than 20.
2014-12-11 10:36:15 +01:00
PsiOmegaDelta
c66cc1ac5e
Merge pull request #7387 from mwerezak/alarms
...
Fixes #7354
2014-12-11 10:25:06 +01:00
PsiOmega
e73e449dcc
Fixes #7293 .
...
Attempts to make SMES less stubborn about refusing to be turned off.
Removes code in Topic() which is handled by parent.
2014-12-11 09:26:34 +01:00
Zuhayr
300a42a658
Fixes #7388
2014-12-11 18:38:02 +10:30
PsiOmega
c587c4d8b0
Ready-button consistency.
...
The Ready/Not Ready options during round now always set the ready flag as according to their name, rather than always toggle.
This prevents the case where (due to heavy load/no processing of dialogs during early client startup) the dialog claim one thing and the lobby status tab another.
2014-12-11 08:44:56 +01:00
PsiOmega
8c8480cb26
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/machinery/computer/crew.dm
2014-12-11 08:18:58 +01:00
PsiOmegaDelta
a906d45b3c
Merge pull request #7383 from Segrain/dev-freeze
...
Dev-freeze fixes.
2014-12-11 06:42:44 +01:00
mwerezak
6d3ab9ea46
Fixes #7354
2014-12-11 00:41:44 -05:00
Segrain
0fc7177894
Fix for ghost hearing.
2014-12-11 08:32:27 +03:00
Segrain
323cc56a89
Topic fix.
2014-12-11 05:01:06 +03:00
Segrain
2582ef02b8
Namefix.
2014-12-11 05:00:31 +03:00
Hubblenaut
55355cc77d
Context-based Combat Fixes
2014-12-11 00:25:52 +01:00
PsiOmega
087cc1882c
Fixes #7366 .
...
Kills unecessary photo datum which wasn't even used correctly anymore.
Photos have a global id for ease of synth syncing.
Changes how law/photo syncing is handled when pulsing the appropriate borg wire.
Also ensures re-synced borgs are added/removed from the appropriate AIs.
2014-12-10 21:54:57 +01:00
PsiOmega
8e5bc3a589
Fixes #7356 .
...
Clam now uses the proper arg name when trying to create borers.
Fixes a minor issue in the event manager, where the wrong Topic arg was used.
2014-12-10 20:11:00 +01:00
Zuhayr
52152166b3
Wip fixing suit spints.
2014-12-10 18:49:32 +10:30
Zuhayr
5730bcb885
Merged master/dev config.txt.
2014-12-10 16:35:39 +10:30
ccomp5950
3414e48ceb
Adds "paranoid" option to remove more powerful debug options from R_DEBUG.
...
The purpose of this is to allow for testers on our test server without them having advance proc call which can do some fun stuff with python, etc.
Also removes debug controller so that testers can't just edit the configuration to remove debugparanoid
The default config is the status quo, you have to go out of your way and set this option in config to remove proccal from R_DEBUG
2014-12-09 21:25:07 -05:00
Zuhayr
53627175ef
Merge pull request #7347 from Baystation12/master
...
Updating dev-freeze from master.
2014-12-10 03:21:56 +10:30
