Chinsky
3286de0a4f
Merge pull request #8766 from PsiOmegaDelta/BetterMath
...
Emergency shuttle delay feedback correction.
2015-04-09 08:15:22 +03:00
Chinsky
7b15bd59e5
Merge pull request #8768 from Yoshax/emergencymessage
...
Emergency message changes
2015-04-09 08:15:19 +03:00
PsiOmega
b52e3168c2
Area/Camera network refactor - Part 2
...
Renames areas for more logical order in alarm consoles and other locations.
Begins dividing the cameras into separate networks instead of being dumped into SS13. Changes c-tags to ensure related cameras are sorted together.
Civilian West (vacant office, cargo, primary tool storage, etc., main hallways excluded) updated this run.
Also includes:
All staff offices, including QM's, now have a privacy mode and door buttons.
2015-04-08 13:20:22 +02:00
PsiOmega
71a8ddf50e
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/gamemodes/cult/runes.dm
code/modules/paperwork/paper.dm
code/modules/projectiles/projectile.dm
2015-04-08 10:55:26 +02:00
PsiOmega
66c56926d0
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/gamemodes/cult/runes.dm
2015-04-08 10:40:38 +02:00
Zuhayr
cee229733e
Merge branch 'dev' of https://github.com/Zuhayr/Baystation12 into dev
2015-04-07 18:38:59 -07:00
Chinsky
143f036ccd
Merge pull request #8745 from Kelenius/ofLingsAndMeta
...
Removes the bullshit ling meta message
2015-04-08 03:24:15 +03:00
Chinsky
23c20556b4
Merge pull request #8767 from RavingManiac/dev-freeze
...
Vending Machine Fixes
2015-04-08 03:23:40 +03:00
mwerezak
193430bff9
Fixes #8771
2015-04-07 15:55:18 -04:00
Chinsky
175fdf57e6
Merge pull request #8703 from PsiOmegaDelta/Map
...
Area/Camera network refactor - Part 1
2015-04-07 21:41:06 +03:00
Yoshax
bb9a418ed0
Fixes blue, removes commented out code, gives file a meaningful name.
2015-04-07 13:54:22 +01:00
RavingManiac
6482dfb374
EFTPOS scanners now work with IDs in PDAs and wallets
...
Vending machine code revised slightly
"\the" added to visible messages where applicable
2015-04-07 22:09:11 +10:00
RavingManiac
adf39aaace
Vending machines should now work with any ID-containing object
2015-04-07 13:10:03 +10:00
Mustafa Kalash
177d968933
Changes flour sacks to a condiment, so that players will be able to pour flour straight into beakers, instead of having to use the grinder first.
2015-04-06 18:40:11 -04:00
Yoshax
d78ae0d509
Merge branch 'aiemergencymessage' into emergencymessage
2015-04-06 20:19:27 +01:00
Yoshax
5a34b1481b
Big emergency message changes
2015-04-06 20:17:18 +01:00
Chinsky
4a897e47b9
Merge pull request #8641 from PsiOmegaDelta/CultVisualNetwork
...
Cult Visual network
2015-04-06 20:19:49 +03:00
Chinsky
cbfa0ef0e8
Merge pull request #8759 from PsiOmegaDelta/NewThermals
...
Thermal/NVG changes.
2015-04-06 20:14:39 +03:00
RavingManiac
0be6fd113a
PLayer can now pay vending machines without removing ID from PDA or wallet. Clicking on the vending machine with ID/PDA/wallet/cash also brings up the menu instead of attacking the vending machine.
2015-04-07 03:00:51 +10:00
PsiOmega
aeb0af8a7f
Emergency shuttle delay feedback correction.
...
The emergency shuttle now states that the max refuel is 10 minutes rather than 100 minutes.
2015-04-06 15:26:46 +02:00
PsiOmegaDelta
fd1b6343f0
Merge pull request #8655 from volas/sanitize_procs2
...
sanitize(), part 2
2015-04-06 15:16:17 +02:00
PsiOmega
d8a6576f36
Examination fixes.
...
Fixes #8491 .
Fixes #8579 .
2015-04-06 10:46:19 +02:00
PsiOmega
036a948372
Rune logging.
...
Adds various rune logging.
2015-04-06 09:44:56 +02:00
Yoshax
b69ab10da0
Merge branch 'dev' into aiemergencymessage
2015-04-05 17:39:30 +01:00
RavingManiac
e2b9657ca4
Minor fixes to supermatter manual text
2015-04-05 22:40:19 +10:00
PsiOmega
75757a48f6
Merge remote-tracking branch 'upstream/dev' into Map
2015-04-05 09:55:41 +02:00
PsiOmega
d3a1ddfa09
Thermal/NVG changes.
...
Thermals/NVGs can now be toggled on/off from the GUI action bar, same as mesons.
Adds charge sound for special goggles.
2015-04-05 09:54:55 +02:00
Chinsky
c86706f0d3
Merge pull request #8699 from mwerezak/docking-update
...
Adds docking support for multishuttles
2015-04-05 09:49:59 +03:00
Neerti
326fde4c5f
Adds the research module, condensed into one commit so far.
2015-04-04 20:17:59 -04:00
Kelenius
b25993e130
Updates jar sprite
...
Also fixes a tiny grammar mistake
2015-04-04 18:59:03 +03:00
Kelenius
9a60cd6222
Removes the bullshit ling meta message
2015-04-04 13:40:15 +03:00
Mustafa Kalash
94a56e3c2b
Adds a toggle for allowing a target to use a radio (handheld or headset.)
2015-04-03 17:42:16 -04:00
mwerezak
2217407dca
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into docking-update
2015-04-03 15:14:44 -04:00
mwerezak
f2e816e76e
Merge remote-tracking branch 'upstream/dev' into docking-update
2015-04-03 15:04:32 -04:00
Zuhayr
a3ed7fc033
Should fix the head and hair issues from the organ rewrite.
2015-04-03 05:41:33 -07:00
PsiOmega
8e55ad8114
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/mob/mob.dm
2015-04-03 09:33:05 +02:00
PsiOmega
4326b8c5d8
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-04-03 09:22:23 +02:00
volas
2622d2dbfc
sanitize() refactor: fourth pass
2015-04-03 00:40:57 +03:00
Chinsky
96dd9df079
Merge pull request #8704 from Zuhayr/dev
...
Fixes
2015-04-02 23:49:54 +03:00
Chinsky
c584155edd
Merge pull request #8688 from PsiOmegaDelta/Events
...
Adds more events, misc event changes.
2015-04-02 23:43:45 +03:00
Yoshax
1d4dd72b2e
Changes comms console to only have one access level for all heads.
2015-04-02 21:11:21 +01:00
GinjaNinja32
e82894aadc
Fixes runtime when attempting to latejoin into a deleted core
2015-04-02 05:16:20 +01:00
mwerezak
a116723fcd
Updates canister process() to use atmos helper procs
2015-04-02 00:04:44 -04:00
Zuhayr
84b903cf69
Fixes #8702 properly.
2015-04-01 17:57:28 -07:00
Zuhayr
c3eb6102b4
Added a few null checks.
2015-04-01 17:15:59 -07:00
Zuhayr
93a63134b1
Fixes #8711
2015-04-01 16:56:59 -07:00
Zuhayr
8475be5d4e
Fixes a few incidental bugs with the antag and organ changes.
2015-04-01 06:33:47 -07:00
Zuhayr
03d5c2a5cd
Fixes #8619
2015-04-01 05:55:34 -07:00
PsiOmega
e6cd517f47
Area/Camera network cleanup - Part 1
...
Renames areas for more logical order in alarm consoles and other locations.
Begins dividing the cameras into separate networks instead of being dumped into SS13. Changes c-tags to ensure related cameras are sorted together.
Security updated first.
The AI jump-to-network command now offers a sorted list as well as quick selection (using the chat bar).
2015-04-01 13:12:36 +02:00
PsiOmega
56a8195d1c
Merge remote-tracking branch 'upstream/dev' into CultVisualNetwork
...
Conflicts:
code/setup.dm
2015-04-01 12:47:31 +02:00
