Neerti
6567c68ecb
Merge remote-tracking branch 'remotes/upstream/dev' into 1_30_2015_new_shuttle
2015-02-04 13:34:48 -05:00
Neerti
13d8bd47e7
Adds subtype of the AI core structure to disallow latejoining.
...
Fixes a bug where carding an AI would free open a slot.
Adds cameras and holopads to the shuttle and a few areas at Centcom.
Adds check to AI's Life() to make sure it won't die in areas which have magical free power.
Adds subtype of oxygen canister, which starts off very cold. This is meant to replace the freezer on Centcom, and for the emergency shuttle's cryo.
2015-02-04 13:29:55 -05:00
Ravensdale
7d502aa255
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into mapSanity
2015-02-04 07:40:20 -08:00
Chinsky
4f541758c6
Merge pull request #8003 from Jamini/dev
...
Added Tajran, Lizardfiend, and Slugfiendian depiction transformations for the CE rig
2015-02-04 18:17:32 +03:00
Chinsky
8a46903231
Merge pull request #7830 from PsiOmegaDelta/CanTrack
...
Camera tracking logic cleanup and tracking notice feature.
2015-02-04 18:17:21 +03:00
Chinsky
f8b94456ba
Merge pull request #7844 from Kelenius/ofDryingAndRacks
...
Adds drying racks, tobacco, and updates pipes
2015-02-04 18:15:13 +03:00
Chinsky
f1c5c9d08d
Merge pull request #7680 from Skully71/chancespawn
...
Add a chance spawn object to enable spawning a given object at chance
2015-02-04 18:14:31 +03:00
Chinsky
82ca870c53
Merge pull request #8028 from GinjaNinja32/beaker
...
Change beakers, bottles, syringes and vials to use /image and multiplicative blending
2015-02-04 18:14:22 +03:00
Chinsky
f386d2eb47
Merge pull request #7979 from PsiOmegaDelta/GhostSight
...
Ghosts now have more sight options.
2015-02-04 17:31:21 +03:00
Ravensdale
fcb2770004
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into mapSanity
2015-02-04 05:15:23 -08:00
RavingManiac
8bc85c6bca
Missing files added
2015-02-04 20:40:39 +08:00
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
Skully71
3d2abddaa7
Add random single object to enable a given object to be spawned at chance
2015-02-04 10:41:47 +01:00
PsiOmegaDelta
1eaf311b25
Merge pull request #7887 from Zuhayr/pickaxes
...
Renames pickaxes to drills, resprites accordingly.
2015-02-04 06:32:37 +01:00
Chinsky
a737dd0ca2
Merge pull request #7800 from Zuhayr/randmap
...
Random map generator/distribution map refactor.
2015-02-04 07:11:45 +03:00
Zuhayr
0091aca22c
Merge with dev.
2015-02-04 11:05:35 +10:30
Zuhayr
11ec632c22
Merge branch 'randmap' of https://github.com/Zuhayr/Baystation12 into randmap
2015-02-04 11:03:44 +10:30
Zuhayr
3402912335
Merge with dev.
2015-02-04 11:03:13 +10:30
Ravensdale
84fa5379c5
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into mapSanity
2015-02-03 15:18:27 -08:00
PsiOmega
0ec47b225f
Merge remote-tracking branch 'upstream/dev' into GhostSight
...
Conflicts:
code/setup.dm
2015-02-04 00:00:17 +01:00
Ravensdale
2e275d7e5e
Area cleanup part 1: Engineering Department
2015-02-03 14:50:11 -08:00
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
PsiOmega
a7a33e0a35
Merge remote-tracking branch 'upstream/dev' into GhostSight
...
Conflicts:
code/modules/mob/dead/observer/observer.dm
2015-02-03 22:28:53 +01:00
PsiOmega
ffa13c68cb
Merge remote-tracking branch 'upstream/dev' into CanTrack
...
Conflicts:
code/modules/mob/living/living_defines.dm
2015-02-03 22:27:22 +01:00
Kelenius
9edb5751fb
Adds tobacco and maps in drying racks
2015-02-03 22:24:49 +03:00
Kelenius
536388978f
Conflict fix
2015-02-03 20:57:16 +03:00
Kelenius
0e7ed6aef4
Merge branch 'dev' into ofDryingAndRacks
2015-02-03 20:51:27 +03:00
GinjaNinja32
05532fd330
Merge remote-tracking branch 'upstream/dev' into supply
2015-02-03 17:22:10 +00:00
GinjaNinja32
444c7c71f3
Maps in floor painter in engineering workshop, makes it and pipe painters orderable from Cargo
2015-02-03 17:19:45 +00:00
PsiOmega
49eac0d9ca
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-02-03 17:23:04 +01:00
PsiOmega
0d84f836a4
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-02-03 17:15:02 +01:00
PsiOmegaDelta
021096d924
Merge pull request #7841 from comma/firefirEFIREBURNAHAHAHA
...
Ported TG's code for burny mobs, by ergovisavi.
2015-02-03 17:02:09 +01:00
Chinsky
71b19d5d8f
Stupid typo & missing constants
2015-02-03 18:44:26 +03:00
PsiOmegaDelta
24a7f5b5f0
Merge pull request #7938 from LethalGhost/dev
...
More convenient give verb.
2015-02-03 16:32:20 +01: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
GinjaNinja32
fa75cb9fab
Change beakers, bottles, syringes and vials to use /image and multiplicative blending
2015-02-03 15:23:48 +00:00
Chinsky
c3559556a0
Merge pull request #8027 from Baystation12/dev-freeze
...
Wiz freeze
2015-02-03 18:23:18 +03:00
Chinsky
576f9c84a3
Merge pull request #8016 from PsiOmegaDelta/Impersonation
...
Voice changer impersonation now works.
2015-02-03 18:16:23 +03:00
Chinsky
95ff9570ee
Merge pull request #7930 from RKF45/newpaint
...
Generic paint
2015-02-03 18:15:42 +03:00
Chinsky
5ed006bcf0
Merge pull request #7902 from Kelenius/ofCratesAndMastermind
...
Changes abandoned crate contencs and replaces minispess with mastermind
2015-02-03 18:15:35 +03:00
Chinsky
7ef4192950
Merge pull request #7941 from mwerezak/radiator
...
Expands on SkyMarshal's radiation changes
2015-02-03 18:14:56 +03:00
Chinsky
889fee1b82
Merge pull request #7983 from PsiOmegaDelta/SynthStamp
...
Timestamped AI radio messages.
2015-02-03 18:14:44 +03:00
Chinsky
28ee1be312
Merge pull request #7952 from PsiOmegaDelta/AIEye
...
Observers can now see the AI eye
2015-02-03 18:14:08 +03:00
Chinsky
6c4f0a1541
Merge pull request #7949 from Loganbacca/pipemaker
...
Mirrored manual T-valves
2015-02-03 18:14:00 +03:00
PsiOmegaDelta
ba72db2275
Merge pull request #7866 from SparklySheep/patch-12
...
Adds medical belts to sterile equipment crate.
2015-02-03 16:12:40 +01: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
dd52f970e2
Merge pull request #7856 from mwerezak/emote
...
Adds ^ say shortcut for visible emotes
2015-02-03 16:11:36 +01:00
Chinsky
74df9669a0
Merge pull request #7719 from Zuhayr/species_tweaks
...
Species tweaks.
2015-02-03 18:11:18 +03:00
