RavingManiac
38d62a278a
Holodeck code moved to modules, holo-object code put in separate file. Holodeck expanded from 5x10 to 10x10. Holodeck areas updated accordingly. Holodeck courtroom added. Holodeck gravity can now be toggled. Reduced stun-time from gravity turning on. Changed the thunk() message a bit. Window-doors can now be deleted silently.
...
Changelog updated.
2015-02-04 20:05:43 +08:00
Zuhayr
11ec632c22
Merge branch 'randmap' of https://github.com/Zuhayr/Baystation12 into randmap
2015-02-04 11:03:44 +10:30
Zulker Nayeen Nahiyan
0a3f523066
Merge remote-tracking branch 'refs/remotes/origin/dev' into dev
...
Conflicts:
code/__HELPERS/maths.dm
code/__HELPERS/type2type.dm
code/modules/clothing/head/hardhat.dm
code/modules/clothing/spacesuits/captain.dm
code/modules/clothing/spacesuits/miscellaneous.dm
code/modules/clothing/spacesuits/rig/rig_pieces.dm
code/modules/clothing/spacesuits/rig/suits/light.dm
code/modules/clothing/spacesuits/spacesuits.dm
code/modules/clothing/suits/armor.dm
code/modules/clothing/suits/utility.dm
code/modules/events/event_manager.dm
code/modules/mob/living/living.dm
code/setup.dm
2015-02-04 04:44:09 +06:00
Chinsky
84472462ab
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into firefirEFIREBURNAHAHAHA
...
Conflicts:
code/modules/mob/living/living_defines.dm
2015-02-03 18:30:18 +03:00
Chinsky
95ff9570ee
Merge pull request #7930 from RKF45/newpaint
...
Generic paint
2015-02-03 18:15:42 +03:00
Chinsky
6c4f0a1541
Merge pull request #7949 from Loganbacca/pipemaker
...
Mirrored manual T-valves
2015-02-03 18:14:00 +03:00
Chinsky
b6ca496a93
Merge pull request #7617 from fira/obscomps
...
Observers Improvements: Ghosts are able to spy on computers, SMES and APCs, with NanoUI and OldUI support
2015-02-03 18:12:16 +03:00
Chinsky
aa7fde250c
Merge pull request #7801 from Mloc/bs12-glowypipes
...
refactor buckling + glowy HE pipes
2015-02-03 18:12:09 +03:00
PsiOmegaDelta
cda262bbe4
Merge pull request #7863 from Kelenius/ofAlarmsAndScrubbers
...
Adds oxygen and nitrogen to air alarm scrubber list
2015-02-03 16:11:49 +01:00
PsiOmegaDelta
70e8efb9fa
Merge pull request #8018 from GinjaNinja32/ai
...
Adds AI latejoin
2015-02-03 16:10:46 +01:00
Chinsky
1c3b1087dd
Merge pull request #7582 from Zuhayr/richard
...
Do you like hurting other people?
2015-02-03 18:10:34 +03:00
Chinsky
6546dc6a77
Merge pull request #7682 from SparklySheep/patch-11
...
Adds the visitor alt-title.
2015-02-03 18:09:50 +03:00
PsiOmega
a57cd8c380
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-02-03 14:51:54 +01:00
PsiOmega
1732d0c79a
Merge remote-tracking branch 'upstream/master' into TheGreatPurge
...
Conflicts:
code/WorkInProgress/computer3/computers/message.dm
code/WorkInProgress/kilakk/responseteam.dm
2015-02-03 14:16:14 +01:00
Chinsky
95eacd2185
Merge pull request #8008 from volas/sanitize_procs
...
Fixes for some sanitize moments
2015-02-03 15:08:47 +03:00
Chinsky
72463a35f3
Another pass at WIP folder
2015-02-03 12:14:13 +03:00
Chinsky
2a1f0849d8
Cleaned out my WIP folder.
2015-02-03 08:27:18 +03:00
D Anzorge
abeb634d01
Make borg radio window tell if loudspeaker is on
2015-02-02 16:27:14 -05:00
D Anzorge
609f9848bc
Fix borg radio weirdness
...
Borg radio interface toggling was backwards: when usr got the message that the subspace mode was
disabled, the radio would actually enter subspace mode.
2015-02-02 16:27:14 -05:00
GinjaNinja32
271fe31e64
Admin verb to toggle latejoin-ability. Wipe Core disallowed in malfunction.
2015-02-02 18:34:26 +00:00
GinjaNinja32
6ea6c82897
AI latejoin
2015-02-02 17:59:57 +00:00
RKF45
6577cd2a55
Merge remote-tracking branch 'upstream/dev' into newpaint
...
Conflicts:
code/game/objects/items/weapons/paint.dm
2015-02-01 23:04:18 +01:00
RKF45
4d8dd50cea
Mixing of paint
...
The generic paint can now be mixed and tranferred.
2015-02-01 22:54:18 +01:00
volas
949ac26804
a few more copytext(sanitize()) fixes
2015-02-01 23:42:43 +03:00
volas
ea8e848463
copytext() check for some input
2015-02-01 23:16:04 +03:00
volas
8abd7d0735
correction of all copytext(sanitize(..)) to sanitize(copytext(..))
2015-02-01 22:54:56 +03:00
PsiOmega
6fabf503e1
Merge remote-tracking branch 'upstream/master' into dev
2015-02-01 17:39:19 +01:00
Zuhayr
d6b03ea768
Merge pull request #7974 from mwerezak/ert
...
ERT adjustment and fixes
2015-02-01 20:47:40 +10:30
RKF45
4eb3e16f72
Reviewing paint recipes
...
All recipes make "paint" and have different colours via var/resultcolor
White paint can also be made non-ghettoly.
2015-02-01 01:34:39 +01:00
Chinsky
02dc784332
Merge pull request #7981 from PsiOmegaDelta/MedicalSuccess
...
Medbots now report treatment on success instead of attempt.
2015-01-30 20:00:38 +03:00
Chinsky
b995c856a9
Merge pull request #7924 from Kelenius/ofTablesAndPass
...
Removes FPRINT and TABLEPASS flags
2015-01-30 16:17:41 +03:00
PsiOmega
7a72d654bd
(Likely) fixes #7987 .
...
Camera consoles again confirm that a given camera is accessible.
2015-01-30 09:38:37 +01:00
PsiOmegaDelta
80132bdd23
Merge pull request #7978 from Zuhayr/dev-freeze
...
Fixes
2015-01-30 09:25:23 +01:00
PsiOmega
9e9324f010
Fixes #7961 .
...
No longer have to stand on top of turrets to interact with them.
2015-01-29 10:31:20 +01:00
PsiOmega
7ca1ca7d79
Medbots now report treatment on success instead of attempt.
...
Makes them work similar to security bots/Beepsky.
2015-01-29 09:44:18 +01:00
PsiOmega
ebf3d25cae
Additional support for non-Exodus maps.
...
Teleport now also checks config for appropriate Z-levels instead of using hard-coded values.
2015-01-29 09:17:48 +01:00
Zuhayr
b280cb6d42
Fixes #7919
2015-01-29 11:27:56 +10:30
Zuhayr
01bd0875fe
Fixes #7973
2015-01-29 11:08:22 +10:30
mwerezak
849e968924
ERT adjustment and fixes
...
Removes the mounted laser cannon from the ERT hardsuits and instead
provides a single cannon for the team.
Moves the sidearms out to the other ert stations to make it more clear
that they may be used by other ERT roles.
Fixes rechargers now working in Centcom areas.
2015-01-28 13:11:04 -05:00
GinjaNinja32
bc0f5762be
Camera sorting improvements
2015-01-28 04:33:31 +00:00
Zuhayr
4ef1c921fe
Merge pull request #7954 from Loganbacca/nukefix
...
Fixes issues with nuclear mode rename
2015-01-28 10:14:59 +10:30
Chinsky
34a7549460
Merge pull request #7963 from Baystation12/dev-freeze
...
freeze->warlock
2015-01-27 21:56:07 +03:00
Chinsky
c7aff28ffe
Merge pull request #7962 from Baystation12/master
...
master->freeze
2015-01-27 21:55:46 +03:00
PsiOmegaDelta
2a516ed80a
Merge pull request #7959 from mwerezak/hoverpod
...
Returns hoverpod step drain to 10
2015-01-27 16:34:13 +01:00
mwerezak
f80f8f3057
Returns hoverpod step drain to 10
2015-01-27 01:05:10 -05:00
Loganbacca
fbabdce615
Finished renaming nuclear mode to mercenary
...
Mostly cleans up the admin side of things.
2015-01-27 13:42:27 +13:00
Loganbacca
9f5f7f0915
Added mirrored manual T-valves
2015-01-26 22:22:44 +13:00
PsiOmegaDelta
1af6db847d
Merge pull request #7945 from Loganbacca/tapefixes
...
Tape fixes
2015-01-26 08:12:47 +01:00
Loganbacca
47157a20be
Fixed mercenary game mode announcement
2015-01-26 17:57:34 +13:00
Ravensdale
5878d415ad
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into mappin
2015-01-25 20:36:19 -08:00
